summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5.1/modules/implementation-jee/src
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.5.1/modules/implementation-jee/src')
-rw-r--r--branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java43
-rw-r--r--branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java36
-rw-r--r--branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java38
-rw-r--r--branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java61
-rw-r--r--branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java313
-rw-r--r--branches/sca-java-1.5.1/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor21
-rw-r--r--branches/sca-java-1.5.1/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory21
-rw-r--r--branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/ReadTestCase.java88
-rw-r--r--branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/WriteTestCase.java68
-rw-r--r--branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/test/Helloworld.java25
-rw-r--r--branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/test/MockImplementationProviderFactory.java44
-rw-r--r--branches/sca-java-1.5.1/modules/implementation-jee/src/test/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory19
-rw-r--r--branches/sca-java-1.5.1/modules/implementation-jee/src/test/resources/org/apache/tuscany/sca/implementation/jee/xml/TestJEE.composite32
13 files changed, 0 insertions, 809 deletions
diff --git a/branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java b/branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java
deleted file mode 100644
index 779ac976ee..0000000000
--- a/branches/sca-java-1.5.1/modules/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/branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java b/branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java
deleted file mode 100644
index 331c53a596..0000000000
--- a/branches/sca-java-1.5.1/modules/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/branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java b/branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java
deleted file mode 100644
index b82571dc58..0000000000
--- a/branches/sca-java-1.5.1/modules/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/branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java b/branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java
deleted file mode 100644
index 39f3c12816..0000000000
--- a/branches/sca-java-1.5.1/modules/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/branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java b/branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java
deleted file mode 100644
index 9059d2da26..0000000000
--- a/branches/sca-java-1.5.1/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java
+++ /dev/null
@@ -1,313 +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<JEEImplementation> {
- 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<Composite> 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<JEEImplementation> getModelType() {
- // Returns the type of model processed by this processor
- return JEEImplementation.class;
- }
-
- public JEEImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-
- // Read an <implementation.jee> element
- JEEImplementation implementation = implementationFactory.createJEEImplementation();
- implementation.setUnresolved(true);
-
- implementation.setName(IMPLEMENTATION_JEE);
-
- // 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);
- }
-
- // 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 <implementation.jee>
- writeStart(writer, IMPLEMENTATION_JEE.getNamespaceURI(), IMPLEMENTATION_JEE.getLocalPart(),
- new XAttr("archive", implementation.getArchive()));
-
- policyProcessor.writePolicyAttributes(implementation, writer);
- writeEnd(writer);
- }
-}
diff --git a/branches/sca-java-1.5.1/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-1.5.1/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 06b5f2198b..0000000000
--- a/branches/sca-java-1.5.1/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,21 +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.
-
-# $Rev$ $Date$
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.jee.xml.JEEImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.jee,model=org.apache.tuscany.sca.implementation.jee.JEEImplementation,factory=org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory
diff --git a/branches/sca-java-1.5.1/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory b/branches/sca-java-1.5.1/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory
deleted file mode 100644
index dcdfb7dfb5..0000000000
--- a/branches/sca-java-1.5.1/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory
+++ /dev/null
@@ -1,21 +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.
-
-# $Rev$ $Date$
-
-# Implementation class for model factory
-org.apache.tuscany.sca.implementation.jee.impl.JEEImplementationFactoryImpl
diff --git a/branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/ReadTestCase.java b/branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/ReadTestCase.java
deleted file mode 100644
index 471ce480a0..0000000000
--- a/branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/ReadTestCase.java
+++ /dev/null
@@ -1,88 +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 java.io.InputStream;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.implementation.jee.impl.JEEImplementationImpl;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Test reading JEE implementations.
- *
- * @version $Rev$ $Date$
- */
-public class ReadTestCase extends TestCase {
-
- private XMLInputFactory inputFactory;
- private StAXArtifactProcessor<Object> staxProcessor;
- private CompositeBuilder compositeBuilder;
-
- @Override
- public void setUp() throws Exception {
- DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
- inputFactory = XMLInputFactory.newInstance();
- StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
- staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-
- ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
- AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
- SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
- UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
- InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
- IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
- compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper, null);
- }
-
- public void testReadComposite() throws Exception {
- InputStream is = getClass().getResourceAsStream("TestJEE.composite");
- XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- Composite composite = (Composite) staxProcessor.read(reader);
- assertNotNull(composite);
-
- compositeBuilder.build(composite);
- JEEImplementationImpl implementation = (JEEImplementationImpl) composite.getComponents().get(0).getImplementation();
-
- assertTrue(implementation.getArchive().equals("myarchive.ear"));
- PolicySet policySet = implementation.getPolicySets().get(0);
- assertEquals(new QName("http://sample/test-policy", "allowRole1"), policySet.getName());
- }
-
-}
diff --git a/branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/WriteTestCase.java b/branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/WriteTestCase.java
deleted file mode 100644
index 1ec1e928d2..0000000000
--- a/branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/WriteTestCase.java
+++ /dev/null
@@ -1,68 +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 java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-
-/**
- * Test reading/write JEE implementations.
- *
- * @version $Rev$ $Date$
- */
-public class WriteTestCase extends TestCase {
-
- private XMLInputFactory inputFactory;
- private XMLOutputFactory outputFactory;
- private StAXArtifactProcessor<Object> staxProcessor;
-
- @Override
- public void setUp() throws Exception {
- DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
- inputFactory = XMLInputFactory.newInstance();
- outputFactory = XMLOutputFactory.newInstance();
- StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
- staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null);
- }
-
- public void testReadWriteComposite() throws Exception {
- InputStream is = getClass().getResourceAsStream("TestJEE.composite");
- Composite composite = (Composite) staxProcessor.read(inputFactory.createXMLStreamReader(is));
- assertNotNull(composite);
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
-
- assertTrue(bos.toString().contains("archive=\"myarchive.ear\""));
- assertTrue(bos.toString().contains("allowRole1"));
- }
-
-}
diff --git a/branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/test/Helloworld.java b/branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/test/Helloworld.java
deleted file mode 100644
index 2cb6886b31..0000000000
--- a/branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/test/Helloworld.java
+++ /dev/null
@@ -1,25 +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 test;
-
-public interface Helloworld {
-
- String getGreetings(String name);
-}
diff --git a/branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/test/MockImplementationProviderFactory.java b/branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/test/MockImplementationProviderFactory.java
deleted file mode 100644
index 5b9b2a890b..0000000000
--- a/branches/sca-java-1.5.1/modules/implementation-jee/src/test/java/test/MockImplementationProviderFactory.java
+++ /dev/null
@@ -1,44 +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 test;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.jee.JEEImplementation;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-public class MockImplementationProviderFactory implements ImplementationProviderFactory<JEEImplementation>{
-
- public MockImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
-
- }
-
-
- public ImplementationProvider createImplementationProvider(RuntimeComponent component,
- JEEImplementation Implementation) {
- return null;
- }
-
- public Class<JEEImplementation> getModelType() {
- return null;
- }
-
-}
diff --git a/branches/sca-java-1.5.1/modules/implementation-jee/src/test/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/branches/sca-java-1.5.1/modules/implementation-jee/src/test/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 0a7205ab61..0000000000
--- a/branches/sca-java-1.5.1/modules/implementation-jee/src/test/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +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.
-
-# Implementation class for the implementation extension
-test.MockImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.jee.JEEImplementation
diff --git a/branches/sca-java-1.5.1/modules/implementation-jee/src/test/resources/org/apache/tuscany/sca/implementation/jee/xml/TestJEE.composite b/branches/sca-java-1.5.1/modules/implementation-jee/src/test/resources/org/apache/tuscany/sca/implementation/jee/xml/TestJEE.composite
deleted file mode 100644
index edd694a5e2..0000000000
--- a/branches/sca-java-1.5.1/modules/implementation-jee/src/test/resources/org/apache/tuscany/sca/implementation/jee/xml/TestJEE.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample/jee"
- xmlns:sc="http://sample/composite"
- xmlns:test="http://sample/test-policy"
- name="TestJEE">
-
- <component name="TestJEE">
- <implementation.jee archive="myarchive.ear" policySets="test:allowRole1"/>
- </component>
-</composite>