From 1fb6a28a73ca17dbb8c4b3059db590e2f9620943 Mon Sep 17 00:00:00 2001 From: antelder Date: Wed, 3 Aug 2011 09:21:41 +0000 Subject: Correct tag name git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1153404 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/implementation/jee/JEEImplementation.java | 43 --- .../jee/JEEImplementationFactory.java | 36 --- .../jee/impl/JEEImplementationFactoryImpl.java | 38 --- .../jee/impl/JEEImplementationImpl.java | 61 ---- .../jee/xml/JEEImplementationProcessor.java | 330 --------------------- 5 files changed, 508 deletions(-) delete mode 100644 sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java delete mode 100644 sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java delete mode 100644 sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java delete mode 100644 sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java delete mode 100644 sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java (limited to 'sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation') diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java deleted file mode 100644 index 779ac976ee..0000000000 --- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.implementation.jee; - -import org.apache.tuscany.sca.assembly.Composite; - -/** - * The model representing a JEE implementation in an SCA assembly model. - * - * @version $Rev$ $Date$ - */ -public interface JEEImplementation extends Composite { - - /** - * Returns the archive. - * - * @return the archive - */ - String getArchive(); - - /** - * Sets the archive. - * - * @param archive - */ - void setArchive(String archive); -} diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java deleted file mode 100644 index 331c53a596..0000000000 --- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.implementation.jee; - -/** - * Factory for the JEE implementation model. - * - * @version $Rev$ $Date$ - */ -public interface JEEImplementationFactory { - - /** - * Creates a new JEE implementation. - * - * @return a new JEE implementation - */ - JEEImplementation createJEEImplementation(); - -} diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java deleted file mode 100644 index b82571dc58..0000000000 --- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.implementation.jee.impl; - -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory; - -/** - * Factory for the JEE implementation model. - * - * @version $Rev$ $Date$ - */ -public class JEEImplementationFactoryImpl implements JEEImplementationFactory { - - public JEEImplementationFactoryImpl() { - } - - public JEEImplementation createJEEImplementation() { - return new JEEImplementationImpl(); - } -} diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java deleted file mode 100644 index 39f3c12816..0000000000 --- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.implementation.jee.impl; - -import org.apache.tuscany.sca.assembly.ConstrainingType; -import org.apache.tuscany.sca.assembly.impl.CompositeImpl; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; - -/** - * The model representing a JEE implementation in an SCA assembly model. - * - * @version $Rev$ $Date$ - */ -public class JEEImplementationImpl extends CompositeImpl implements JEEImplementation { - - private String archive; - - /** - * Constructs a new JEE implementation. - */ - JEEImplementationImpl() { - super(); - } - - @Override - public ConstrainingType getConstrainingType() { - // The JEE implementation does not support constrainingTypes - return null; - } - - @Override - public void setConstrainingType(ConstrainingType constrainingType) { - // The JEE implementation does not support constrainingTypes - } - - public String getArchive() { - return archive; - } - - public void setArchive(String archive) { - this.archive = archive; - } - - -} diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java deleted file mode 100644 index 83b56cf990..0000000000 --- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java +++ /dev/null @@ -1,330 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.implementation.jee.xml; - -import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; - -import java.net.URI; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.xml.Constants; -import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor; -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEExtension; -import org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension; -import org.apache.tuscany.sca.contribution.jee.ModelObject; -import org.apache.tuscany.sca.contribution.jee.WebModuleInfo; -import org.apache.tuscany.sca.contribution.jee.impl.EjbModuleInfoImpl; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.jee.impl.ModelObjectImpl; -import org.apache.tuscany.sca.contribution.jee.impl.WebModuleInfoImpl; -import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.service.ContributionReadException; -import org.apache.tuscany.sca.contribution.service.ContributionResolveException; -import org.apache.tuscany.sca.contribution.service.ContributionWriteException; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.policy.PolicyFactory; - -/** - * Implements a StAX artifact processor for JEE implementations. - * - * @version $Rev$ $Date$ - */ -public class JEEImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor { - private static final QName IMPLEMENTATION_JEE = new QName(Constants.SCA10_NS, "implementation.jee"); - - private AssemblyFactory assemblyFactory; - private PolicyFactory policyFactory; - private JEEImplementationFactory implementationFactory; - private JavaEEExtension jeeExtension; - private JavaEEOptionalExtension jeeOptionalExtension; - private Monitor monitor; - private PolicyAttachPointProcessor policyProcessor; - - private StAXArtifactProcessorExtensionPoint artifactProcessors; - private StAXArtifactProcessor compositeProcessor; - - public JEEImplementationProcessor(ExtensionPointRegistry registry, - Monitor monitor) { - ModelFactoryExtensionPoint modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class); - this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); - this.policyFactory = modelFactories.getFactory(PolicyFactory.class); - this.implementationFactory = modelFactories.getFactory(JEEImplementationFactory.class); - this.jeeExtension = modelFactories.getFactory(JavaEEExtension.class); - this.jeeOptionalExtension = modelFactories.getFactory(JavaEEOptionalExtension.class); - this.monitor = monitor; - this.policyProcessor = new PolicyAttachPointProcessor(policyFactory); - - artifactProcessors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - compositeProcessor = artifactProcessors.getProcessor(Composite.class); - } - - public QName getArtifactType() { - // Returns the QName of the XML element processed by this processor - return IMPLEMENTATION_JEE; - } - - public Class getModelType() { - // Returns the type of model processed by this processor - return JEEImplementation.class; - } - - public JEEImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException { - - // Read an element - JEEImplementation implementation = implementationFactory.createJEEImplementation(); - implementation.setUnresolved(true); - - // Read the archive attribute - String archive = getString(reader, "archive"); - if (archive != null) { - implementation.setArchive(archive); - - // Set the URI of the component type - implementation.setURI(archive); - } - - // the resulting implementation (composite) will be cached by the CompositeModelResolver - // based on it's name so we need to derive a unique name for this implementation based - // on the name of the archive that it represents - String path = URI.create(archive).getPath(); - String localName = "impl-jee-current-dir-archive"; - if (path != null){ - int s = path.lastIndexOf('/'); - if (s > -1){ - localName = path.substring(s + 1); - } else { - if (path.length() > 0 && !path.equals(".")){ - localName = path; - } - } - } - - QName name = new QName(Constants.SCA10_TUSCANY_NS, localName); - implementation.setName(name); - - // Read policies - policyProcessor.readPolicies(implementation, reader); - - // Skip to end element - while (reader.hasNext()) { - if (reader.next() == END_ELEMENT && IMPLEMENTATION_JEE.equals(reader.getName())) { - break; - } - } - - return implementation; - } - - public void resolve(JEEImplementation implementation, ModelResolver resolver) throws ContributionResolveException { - // Resolve the component type - String uri = implementation.getURI(); - String archive = implementation.getArchive(); - if (uri != null) { - Object moduleInfo = null; - ExternalEarInfo extEar = null; - if(uri.equals("")) { - if(moduleInfo == null) { - WebModuleInfo unresolved = new WebModuleInfoImpl(); - unresolved.setUri(URI.create(archive)); - WebModuleInfo resolved = resolver.resolveModel(WebModuleInfo.class, unresolved); - if(unresolved != resolved) { - moduleInfo = resolved; - } - } - if(moduleInfo == null) { - EjbModuleInfo unresolved = new EjbModuleInfoImpl(); - unresolved.setUri(URI.create(archive)); - EjbModuleInfo resolved = resolver.resolveModel(EjbModuleInfo.class, unresolved); - if(unresolved != resolved) { - moduleInfo = resolved; - } - } - if(moduleInfo == null) { - JavaEEApplicationInfo unresolved = new JavaEEApplicationInfoImpl(); - unresolved.setUri(URI.create(archive)); - JavaEEApplicationInfo resolved = resolver.resolveModel(JavaEEApplicationInfo.class, unresolved); - if(unresolved != resolved) { - moduleInfo = resolved; - } - } - } else if(uri.endsWith(".war")) { - WebModuleInfo webModuleInfo = new WebModuleInfoImpl(); - webModuleInfo.setUri(URI.create(archive)); - webModuleInfo = resolver.resolveModel(WebModuleInfo.class, webModuleInfo); - moduleInfo = webModuleInfo; - } else if(uri.endsWith(".jar")) { - EjbModuleInfo ejbModuleInfo = new EjbModuleInfoImpl(); - ejbModuleInfo.setUri(URI.create(archive)); - ejbModuleInfo = resolver.resolveModel(EjbModuleInfo.class, ejbModuleInfo); - moduleInfo = ejbModuleInfo; - } else if(uri.endsWith(".ear")) { - final JavaEEApplicationInfo appInfo = new JavaEEApplicationInfoImpl(); - appInfo.setUri(URI.create(archive)); - ExternalEarInfo unresolved = new ExternalEarInfo() { - public JavaEEApplicationInfo getAppInfo() { - return appInfo; - } - public Composite getAppComposite() { - return null; - }}; - - ExternalEarInfo resolved = resolver.resolveModel(ExternalEarInfo.class, unresolved); - if(resolved != unresolved) { - extEar = resolved; - } - moduleInfo = resolved.getAppInfo(); - } - - if(moduleInfo instanceof WebModuleInfo) { - // Check for web composite - ModelObject unresolved = new ModelObjectImpl(); - unresolved.setUri(URI.create("WEB-INF/web.composite")); - ModelObject resolved = resolver.resolveModel(ModelObject.class, unresolved); - if(resolved != unresolved) { - // Found web composite so the war itself must have been the contribution - Composite appComposite = (Composite)resolved.getObject(); - mergeCompositeInfo(appComposite, implementation); - } - - // TODO: Obtain includeDefaults value from the composite - boolean includeDefaults = false; - - if(includeDefaults || resolved == unresolved) { - // there is either no application composite or we are ignoring it as the - // war is nested inside another contribution - if(jeeOptionalExtension != null) { - jeeOptionalExtension.createImplementationJeeComposite((WebModuleInfo)moduleInfo, implementation); - } - // now resolve the implementation composite as a real composite. - compositeProcessor.resolve((Composite)implementation, resolver); - } - } else if(moduleInfo instanceof EjbModuleInfo) { - // Check for ejb-jar composite - ModelObject unresolved = new ModelObjectImpl(); - unresolved.setUri(URI.create("META-INF/ejb-jar.composite")); - ModelObject resolved = resolver.resolveModel(ModelObject.class, unresolved); - if(resolved != unresolved) { - // Found ejb-jar composite so the ejb jar itself must have been the contribution - Composite appComposite = (Composite)resolved.getObject(); - mergeCompositeInfo(appComposite, implementation); - } - - // TODO: Obtain includeDefaults value from the composite - boolean includeDefaults = false; - - if(includeDefaults || resolved == unresolved) { - if(jeeExtension != null) { - jeeExtension.createImplementationJeeComposite((EjbModuleInfo)moduleInfo, implementation); - - } - if(jeeOptionalExtension != null) { - jeeOptionalExtension.createImplementationJeeComposite((EjbModuleInfo)moduleInfo, implementation); - } - // now resolve the implementation composite as a real composite. - compositeProcessor.resolve((Composite)implementation, resolver); - } - } else if(moduleInfo instanceof JavaEEApplicationInfo) { - // Check for application composite - Composite appComposite = null; - if(extEar != null) { - appComposite = extEar.getAppComposite(); - } else { - ModelObject unresolved = new ModelObjectImpl(); - unresolved.setUri(URI.create("META-INF/application.composite")); - ModelObject resolved = resolver.resolveModel(ModelObject.class, unresolved); - if(resolved != unresolved) { - // Found application composite - appComposite = (Composite)resolved.getObject(); - } - } - - if(appComposite != null) { - // Found application composite so copy it's details across into - // the implementation (which is itself a composite) - mergeCompositeInfo(appComposite, implementation); - } - - // TODO: Obtain includeDefaults value from the composite - boolean includeDefaults = false; - - if(includeDefaults || appComposite == null) { - if(jeeExtension != null) { - jeeExtension.createImplementationJeeComposite((JavaEEApplicationInfo)moduleInfo, implementation); - } - if(jeeOptionalExtension != null) { - jeeOptionalExtension.createImplementationJeeComposite((JavaEEApplicationInfo)moduleInfo, implementation); - } - // now resolve the implementation composite as a real composite. - compositeProcessor.resolve((Composite)implementation, resolver); - } - } - - // we could have resolved the whole implementation composite here except that - // it messes up the resolvers associated with the - } - implementation.setUnresolved(false); - } - - private void mergeCompositeInfo(Composite fromComposite, Composite intoComposite){ - intoComposite.getApplicablePolicySets().addAll(fromComposite.getApplicablePolicySets()); - intoComposite.getAttributeExtensions().addAll(fromComposite.getAttributeExtensions()); - intoComposite.setAutowire(fromComposite.getAutowire()); - intoComposite.getComponents().addAll(fromComposite.getComponents()); - intoComposite.setConstrainingType(fromComposite.getConstrainingType()); - intoComposite.getExtensions().addAll(fromComposite.getExtensions()); - intoComposite.setLocal(fromComposite.isLocal()); - intoComposite.getIncludes().addAll(fromComposite.getIncludes()); - intoComposite.setName(fromComposite.getName()); - intoComposite.getPolicySets().addAll(fromComposite.getPolicySets()); - intoComposite.getProperties().addAll(fromComposite.getProperties()); - intoComposite.getReferences().addAll(fromComposite.getReferences()); - intoComposite.getRequiredIntents().addAll(fromComposite.getRequiredIntents()); - intoComposite.getServices().addAll(fromComposite.getServices()); - intoComposite.setType(fromComposite.getType()); - intoComposite.setUnresolved(fromComposite.isUnresolved()); - intoComposite.setURI(fromComposite.getURI()); - intoComposite.getWires().addAll(fromComposite.getWires()); - } - - public void write(JEEImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException { - - // Write - writeStart(writer, IMPLEMENTATION_JEE.getNamespaceURI(), IMPLEMENTATION_JEE.getLocalPart(), - new XAttr("archive", implementation.getArchive())); - - policyProcessor.writePolicyAttributes(implementation, writer); - writeEnd(writer); - } -} -- cgit v1.2.3