diff options
Diffstat (limited to 'sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src')
23 files changed, 0 insertions, 1522 deletions
diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java deleted file mode 100644 index e7e1d90797..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java +++ /dev/null @@ -1,48 +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.test.contribution.jee; - -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.provider.ImplementationProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; - - -class TestEJBImplementationProvider implements ImplementationProvider { - - TestEJBImplementationProvider(RuntimeComponent component, EJBImplementation ejbImplementation) { - } - - public Invoker createInvoker(RuntimeComponentService service, Operation operation) { - return null; - } - - public boolean supportsOneWayInvocation() { - return false; - } - - public void start() { - } - - public void stop() { - } - -} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java deleted file mode 100644 index 4660fee7fd..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java +++ /dev/null @@ -1,47 +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.test.contribution.jee; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.provider.ImplementationProvider; -import org.apache.tuscany.sca.provider.ImplementationProviderFactory; -import org.apache.tuscany.sca.runtime.RuntimeComponent; - -/** - * A factory for resource implementation providers. - * - * @version $Rev$ $Date$ - */ -public class TestEJBImplementationProviderFactory implements ImplementationProviderFactory<EJBImplementation> { - - /** - * Constructs a resource implementation. - */ - public TestEJBImplementationProviderFactory(ExtensionPointRegistry extensionPoints) { - } - - public ImplementationProvider createImplementationProvider(RuntimeComponent component, EJBImplementation implementation) { - return new TestEJBImplementationProvider(component, implementation); - } - - public Class<EJBImplementation> getModelType() { - return EJBImplementation.class; - } -} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java deleted file mode 100644 index 34bf3702d3..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java +++ /dev/null @@ -1,141 +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.test.contribution.jee; - -import java.io.File; -import java.net.URI; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -public class TestExternalEarModelResolver implements ModelResolver { - - private Map<URI, ExternalEarInfo> map = new HashMap<URI, ExternalEarInfo>(); - private JavaEEIntrospector jeeIntrospector; - private ContributionService contributionService; - - - public TestExternalEarModelResolver(Contribution contribution, ExtensionPointRegistry extensionPoints) { - jeeIntrospector = extensionPoints.getExtensionPoint(JavaEEIntrospector.class); - UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - contributionService = utilities.getUtility(ContributionService.class); - - } - - public void addModel(Object resolved) { - ExternalEarInfo jeeApp = (ExternalEarInfo)resolved; - map.put(jeeApp.getAppInfo().getUri(), jeeApp); - } - - public Object removeModel(Object resolved) { - return map.remove(((ExternalEarInfo)resolved).getAppInfo().getUri()); - } - - public <T> T resolveModel(final Class<T> modelClass, T unresolved) { - URI uri = ((ExternalEarInfo)unresolved).getAppInfo().getUri(); - if (uri != null) { - ExternalEarInfo resolved = (ExternalEarInfo) map.get(uri); - if (resolved != null) { - return modelClass.cast(resolved); - } else { - // if you don't care about application composites you can - // simply read the EAR directly - /* - try { - File f = new File(uri.toString()); - final JavaEEApplicationInfo o = jeeIntrospector.introspectJeeArchive(f.toURI().toURL()); - return (T)new ExternalEarInfo() { - public JavaEEApplicationInfo getAppInfo() { - return (JavaEEApplicationInfo)o; - } - }; - } catch (Exception e) { - throw new RuntimeException(e); - } - */ - - // if you do care about the application composite you - // need to process the ear as a contribution - try{ - // find the location of the ear using a very specific algorithm - URL earLocation = null; - if ( uri.toString().equals("itest-contribution-jee-samples-13-ear-nonenhanced.ear")){ - earLocation = new File("../contribution-jee-samples/ear-nonenhanced/target/itest-contribution-jee-samples-13-ear-nonenhanced.ear").toURL(); - } else if ( uri.toString().equals("itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear")){ - earLocation = new File("../contribution-jee-samples/ear-appcomp-contrib-implicit/target/itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear").toURL(); - } else if ( uri.toString().equals("itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp.ear")){ - earLocation = new File("../contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/target/itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp.ear").toURL(); - } else { - return unresolved; - } - - // if you do care about application composites we have - // to process the EAR as a contribution - Contribution contribution = contributionService.contribute(uri.toString(), earLocation, false); - - JavaEEApplicationInfo appInfo = null; - Composite appComposite = null; - - // get the ear info - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof JavaEEApplicationInfo){ - appInfo = (JavaEEApplicationInfo)artifact.getModel(); - } - - if (artifact.getURI().equals("META-INF/application.composite")){ - appComposite = (Composite)artifact.getModel(); - } - } - - - final JavaEEApplicationInfo returnAppInfo = appInfo; - final Composite returnAppComposite = appComposite; - - return (T)new ExternalEarInfo() { - public JavaEEApplicationInfo getAppInfo() { - return returnAppInfo; - } - public Composite getAppComposite() { - return returnAppComposite; - } - }; - } catch (Exception e) { - throw new RuntimeException(e); - } - } - } - - return unresolved; - } - -} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver deleted file mode 100644 index a39171507c..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver +++ /dev/null @@ -1,18 +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.
-
-org.apache.tuscany.sca.test.contribution.jee.TestExternalEarModelResolver;model=org.apache.tuscany.sca.contribution.jee.ExternalEarInfo
diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory deleted file mode 100644 index adc93d9015..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/main/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
-org.apache.tuscany.sca.test.contribution.jee.TestEJBImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.ejb.EJBImplementation
diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java deleted file mode 100644 index b81f67c287..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java +++ /dev/null @@ -1,329 +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.test.contribution.jee; - -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -/** - * This is an integration test for Java EE contribution processing. * - * - * @version $Rev$ $Date$ - */ - -public class ContributionServiceTestCase { - private static final String CONTRIBUTION_001_ID = "contribution001/"; - private static final String CONTRIBUTION_002_ID = "contribution002/"; - private static final String JAR_CONTRIBUTION = "/repository/helloworld-service.jar"; - private static final String EJB_JAR_CONTRIBUTION = "/repository/helloworld-ejb.jar"; - private static final String EJB_JAR_W_DEPLOYABLE_CONTRIBUTION = "/repository/helloworld-ejb-w-dep.jar"; - private static final String WAR_CONTRIBUTION = "/repository/helloworld-web.war"; - private static final String WAR_W_DEPLOYABLE_CONTRIBUTION = "/repository/helloworld-web-w-dep.war"; - private static final String EAR_CONTRIBUTION = "/repository/helloworld-ejb.ear"; - private static final String EAR_NONENHANCED_CONTRIBUTION = "/repository/simple-app-ear.jar"; - private static final String EAR_ENHANCED_16_CONTRIBUTION = "/repository/simple-app.ear"; - private static final String EAR_ENHANCED_19_CONTRIBUTION = "/repository/enhanced-app.ear"; - - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - /** - * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending - * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and - * to get a reference to the contribution service - */ - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * This method tests a non Java EE contribution. - */ - @Test - public void testContributeJAR() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(contributionId)); - } - - /** - * This method tests an EJB jar as a contribution. - */ - @Test - public void testContributeEJBJAR() throws Exception { - URL contributionLocation = getClass().getResource(EJB_JAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(contributionId)); - - Contribution contribution = contributionService.getContribution(contributionId); - List<Artifact> artifacts = contribution.getArtifacts(); - for(Artifact artifact : artifacts) { - if(artifact.getURI().toString().equals("META-INF/ejb-jar.composite")) { - Composite composite = (Composite)artifact.getModel(); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.ejb", component.getImplementation() instanceof EJBImplementation); - EJBImplementation ejbImpl = (EJBImplementation) component.getImplementation(); - Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); - Service service = ejbImpl.getServices().get(0); - Assert.assertEquals("Service name", "HelloworldService", service.getName()); - } - } - } - - /** - * This method tests an EJB jar with sca-contribution.xml as a contribution. - */ - @Test - public void testContributeEJBJARwDeployable() throws Exception { - URL contributionLocation = getClass().getResource(EJB_JAR_W_DEPLOYABLE_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(contributionId)); - - Contribution contribution = contributionService.getContribution(contributionId); - List<Artifact> artifacts = contribution.getArtifacts(); - for(Artifact artifact : artifacts) { - if(artifact.getURI().toString().equals("META-INF/ejb-jar.composite")) { - Composite composite = (Composite)artifact.getModel(); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.ejb", component.getImplementation() instanceof EJBImplementation); - EJBImplementation ejbImpl = (EJBImplementation) component.getImplementation(); - Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); - Service service = ejbImpl.getServices().get(0); - Assert.assertEquals("Service name", "HelloworldService", service.getName()); - } - } - - List<Composite> deployables = contribution.getDeployables(); - Assert.assertEquals("Deployable composites", 1, deployables.size()); - Composite composite = deployables.get(0); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.ejb", component.getImplementation() instanceof EJBImplementation); - EJBImplementation ejbImpl = (EJBImplementation) component.getImplementation(); - Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); - Service service = ejbImpl.getServices().get(0); - Assert.assertEquals("Service name", "HelloworldService", service.getName()); - } - - /** - * This method tests WAR as a contribution. - */ - @Test - public void testContributeWAR() throws Exception { - URL contributionLocation = getClass().getResource(WAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(contributionId)); - - Contribution contribution = contributionService.getContribution(contributionId); - List<Artifact> artifacts = contribution.getArtifacts(); - for(Artifact artifact : artifacts) { - if(artifact.getURI().toString().equals("WEB-INF/web.composite")) { - Composite composite = (Composite)artifact.getModel(); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.web", component.getImplementation() instanceof WebImplementation); - WebImplementation webImpl = (WebImplementation) component.getImplementation(); - Assert.assertEquals("Number of reference", 2, webImpl.getReferences().size()); - List<String> referenceNames = new ArrayList<String>(); - referenceNames.add("name1"); - referenceNames.add("sample.HelloworldEjbServlet_service"); - for(Reference ref : webImpl.getReferences()) { - Assert.assertTrue(referenceNames.contains(ref.getName())); - } - } - } - } - - /** - * This method tests WAR with sca-contribution.xml as a contribution. - */ - @Test - public void testContributeWARwDeployable() throws Exception { - URL contributionLocation = getClass().getResource(WAR_W_DEPLOYABLE_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(contributionId)); - - Contribution contribution = contributionService.getContribution(contributionId); - List<Artifact> artifacts = contribution.getArtifacts(); - for(Artifact artifact : artifacts) { - if(artifact.getURI().toString().equals("WEB-INF/web.composite")) { - Composite composite = (Composite)artifact.getModel(); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.web", component.getImplementation() instanceof WebImplementation); - WebImplementation webImpl = (WebImplementation) component.getImplementation(); - Assert.assertEquals("Number of reference", 2, webImpl.getReferences().size()); - List<String> referenceNames = new ArrayList<String>(); - referenceNames.add("name1"); - referenceNames.add("sample.HelloworldEjbServlet_service"); - for(Reference ref : webImpl.getReferences()) { - Assert.assertTrue(referenceNames.contains(ref.getName())); - } - } - } - - List<Composite> deployables = contribution.getDeployables(); - Assert.assertEquals("Deployable composites", 1, deployables.size()); - Composite composite = deployables.get(0); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.web", component.getImplementation() instanceof WebImplementation); - WebImplementation webImpl = (WebImplementation) component.getImplementation(); - Assert.assertEquals("Number of reference", 2, webImpl.getReferences().size()); - List<String> referenceNames = new ArrayList<String>(); - referenceNames.add("name1"); - referenceNames.add("sample.HelloworldEjbServlet_service"); - for(Reference ref : webImpl.getReferences()) { - Assert.assertTrue(referenceNames.contains(ref.getName())); - } - } - - /** - * This method test EAR as a contribution. - */ - @Test - public void testContributeEAR() throws Exception { - URL contributionLocation = getClass().getResource(EAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(contributionId)); - } - - /** - * This method tests a JAR containing an EAR as a contribution. - * non-enhanced EAR containing non-enhanced WAR, non-enhanced EJB JAR. - */ - @Ignore - @Test - public void testContributeEAR_NonEnhanced() throws Exception { - URL contributionLocation = getClass().getResource(EAR_NONENHANCED_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Contribution contribution = contributionService.getContribution(contributionId); - Assert.assertNotNull(contribution); - List<Composite> deployables = contribution.getDeployables(); - Assert.assertEquals("Deployable composites", 1, deployables.size()); - Composite composite = deployables.get(0); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.jee", component.getImplementation() instanceof JEEImplementation); - JEEImplementation jeeImpl = (JEEImplementation)component.getImplementation(); - Assert.assertEquals("Number of services", 2, jeeImpl.getServices().size()); - Assert.assertEquals("Number of references", 1, jeeImpl.getReferences().size()); - } - - /** - * This method tests an EAR as a contribution. - * Enhanced EAR containing non-enhanced WAR, non-enhanced EJB JAR. - */ - @Test - public void testContributeEAR_Enhanced16() throws Exception { - URL contributionLocation = getClass().getResource(EAR_ENHANCED_16_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Contribution contribution = contributionService.getContribution(contributionId); - Assert.assertNotNull(contribution); - List<Composite> deployables = contribution.getDeployables(); - Assert.assertEquals("Deployable composites", 1, deployables.size()); - Composite composite = deployables.get(0); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.jee", component.getImplementation() instanceof JEEImplementation); - JEEImplementation jeeImpl = (JEEImplementation)component.getImplementation(); - Assert.assertEquals("Number of services", 2, jeeImpl.getServices().size()); - // TODO - TUSCANY-3008 - // Assert.assertEquals("Number of references", 1, jeeImpl.getReferences().size()); - } - - /** - * This method tests an EAR as a contribution. - * Enhanced EAR w application composite containing non-enhanced WAR, non-enhanced EJB JAR. - */ - @Test - public void testContributeEAR_Enhanced19() throws Exception { - URL contributionLocation = getClass().getResource(EAR_ENHANCED_19_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Contribution contribution = contributionService.getContribution(contributionId); - Assert.assertNotNull(contribution); - - List<Artifact> artifacts = contribution.getArtifacts(); - for(Artifact artifact : artifacts) { - if(artifact.getURI().toString().equals("META-INF/application.composite")) { - Composite composite = (Composite)artifact.getModel(); - Assert.assertEquals("Number of components", 3, composite.getComponents().size()); - for(Component component : composite.getComponents()) { - if(component.getName().equals("webComponent")) { - Assert.assertTrue(component.getImplementation() instanceof WebImplementation); - WebImplementation webImpl = (WebImplementation)component.getImplementation(); - Assert.assertEquals("Number of references", 1, webImpl.getReferences().size()); - } else if(component.getName().equals("ejbComponent1")) { - Assert.assertTrue(component.getImplementation() instanceof EJBImplementation); - EJBImplementation ejbImpl = (EJBImplementation)component.getImplementation(); - Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); - Assert.assertEquals("Number of references", 0, ejbImpl.getReferences().size()); - } else if(component.getName().equals("ejbComponent2")) { - Assert.assertTrue(component.getImplementation() instanceof EJBImplementation); - EJBImplementation ejbImpl = (EJBImplementation)component.getImplementation(); - Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); - Assert.assertEquals("Number of references", 1, ejbImpl.getReferences().size()); - } - } - } - } - } -} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java deleted file mode 100644 index 4241b7928f..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java +++ /dev/null @@ -1,110 +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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - - -public class EjbAppcompTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * EJB - It's an JEE EAR file that is a contribution - * appcomp - It has an application composite in it - * - */ - @Test - public void testEjbAppcom() throws Exception { - - URL contributionLocation = new File("../contribution-jee-samples/ejb-appcomp-contrib-implicit/target/itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit.jar").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - Assert.assertEquals(1, composite.getComponents().size()); - Assert.assertEquals(1, composite.getComponents().get(0).getImplementation().getServices().size()); - Assert.assertEquals("HelloworldService", composite.getComponents().get(0).getImplementation().getServices().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - - } - -} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java deleted file mode 100644 index 64c31b4393..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java +++ /dev/null @@ -1,124 +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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import sample.pojo.HelloworldClient2; - - -public class SCAJarEarAppcompTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * SCAJAR - It's an SCA contribution in a JAR with no nested archives - * but which references a... - * EAR - It's an JEE EAR file - * appcomp - It has an application composite in it - * - */ - @Test - public void testSCAJarEarAppcomp() throws Exception { - - URL contributionLocation = new File("../contribution-jee-samples/scajar-ear-appcomp/target/itest-contribution-jee-samples-41-scajar-ear-appcomp.jar").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - domain.getDomainComposite().getIncludes().add(composite); - - Assert.assertEquals(3, composite.getComponents().size()); - Assert.assertEquals(3, composite.getComponents().get(1).getImplementation().getServices().size()); - Assert.assertEquals("TheService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - - domain.getCompositeActivator().activate(composite); - domain.getCompositeActivator().start(composite); - - HelloworldClient2 client = domain.getService(HelloworldClient2.class, "HelloworldClientComponent"); - Assert.assertEquals("Hello Fred Java", client.getGreetings("Fred")); - - domain.stop(); - - } - -} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java deleted file mode 100644 index 9f50ea573c..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java +++ /dev/null @@ -1,125 +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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import sample.pojo.HelloworldClient2; - - -public class SCAJarEarAppcompWarAppcompTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * SCAJAR - It's an SCA contribution in a JAR with no nested archives - * but which references a... - * EAR - It's an JEE EAR file - * appcomp - It has an application composite in it - * WAR - It has a WAR (and and EAR) in it - * appcomp - It has an application composite in it which should be ignored - */ - @Test - public void testSCAJarEarAppcomp() throws Exception { - - URL contributionLocation = new File("../contribution-jee-samples/scajar-ear-appcomp-war-appcomp/target/itest-contribution-jee-samples-43-scajar-ear-appcomp-war-appcomp.jar").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - domain.getDomainComposite().getIncludes().add(composite); - - Assert.assertEquals(3, composite.getComponents().size()); - Assert.assertEquals(2, composite.getComponents().get(1).getImplementation().getServices().size()); - Assert.assertEquals("TheService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - - domain.getCompositeActivator().activate(composite); - domain.getCompositeActivator().start(composite); - - HelloworldClient2 client = domain.getService(HelloworldClient2.class, "HelloworldClientComponent"); - Assert.assertEquals("Hello Fred Java", client.getGreetings("Fred")); - - domain.stop(); - - } - -} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java deleted file mode 100644 index 97e23d1bf7..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java +++ /dev/null @@ -1,139 +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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - - -public class SCAJarEarNonenhancedTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - private static final String CONTRIBUTION_002_ID = "contribution002/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - /** - * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending - * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and - * to get a reference to the contribution service - */ - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * SCAJAR - It's an SCA contribution in a JAR with no nested archives - * but which references a... - * EAR - It's an JEE EAR file - * nonenhanced - It has no SCA enhancements. Just a normal EAR - * - */ - @Test - public void testSCAJarEarNonenhanced() throws Exception{ - /* some thoughts about how to preprocess the ear - * as an alternative to relying on the model resolver - * to do contribution processing. - - // Get some things from the extension registry that help us create the - // link between the contribution and the ear that it references - ExtensionPointRegistry registry = domain.getExtensionPointRegistry(); - ModelResolverExtensionPoint modelResolvers = registry.getExtensionPoint(ModelResolverExtensionPoint.class); - Class<? extends ModelResolver> externalEarModelResolver = modelResolvers.getResolver(ExternalEarInfo.class); - - // locate the ear - URL earLocation = new File("../contribution-jee-samples/ear-nonenhanced/target/itest-contribution-jee-samples-13-ear-nonenhanced.ear").toURL(); - contributionService.contribute(CONTRIBUTION_001_ID, earLocation, false); - - // find the app info - for (Artifact artifact : contributionService.getContribution(CONTRIBUTION_001_ID).getArtifacts()){ - if (artifact.getModel() instanceof JavaEEApplicationInfo){ - // need to make this model available to the external ear model - // resolver. But how? - } - } - */ - - URL contributionLocation = new File("../contribution-jee-samples/scajar-ear-nonenhanced/target/itest-contribution-jee-samples-35-scajar-ear-nonenhanced.jar").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_002_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - Assert.assertEquals(2, composite.getComponents().size()); - Assert.assertEquals(4, composite.getComponents().get(1).getImplementation().getServices().size()); - Assert.assertEquals("HelloworldService7Bean_HelloworldService7", composite.getComponents().get(1).getImplementation().getServices().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - } - -} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java deleted file mode 100644 index db4d9e5bf6..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java +++ /dev/null @@ -1,112 +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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - - -public class SCAZipEjbAppcompTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * SCAZIP - It's an SCA contribution in a ZIP with no nested archive - * but with a reference to an EJB Jar - * JAR - * appcomp - It has an application composite in it - * - */ - @Test - public void testSCAZipEjbAppcomp() throws Exception { - - URL contributionLocation = new File("../contribution-jee-samples/scazip-ejb-appcomp/target/itest-contribution-jee-samples-10-scazip-ejb-appcomp.zip").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - Assert.assertEquals(2, composite.getComponents().size()); - Assert.assertEquals(1, composite.getComponents().get(1).getImplementation().getServices().size()); - Assert.assertEquals("HelloworldServiceBean_HelloworldService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - - } - -} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java deleted file mode 100644 index 211f51c9bd..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java +++ /dev/null @@ -1,114 +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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - - -public class SCAZipWarAppcompTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * SCAJAR - It's an SCA contribution in a JAR with no nested archives - * but which references a... - * EAR - It's an JEE EAR file - * appcomp - It has an application composite in it - * - */ - // not picking up references correctly - @Ignore - @Test - public void testSCAJarEarNonenhanced() throws Exception { - - URL contributionLocation = new File("../contribution-jee-samples/scazip-war-appcomp/target/itest-contribution-jee-samples-04-scazip-war-appcomp.zip").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - Assert.assertEquals(1, composite.getComponents().size()); - Assert.assertEquals(1, composite.getComponents().get(0).getImplementation().getReferences().size()); - Assert.assertEquals("????", composite.getComponents().get(0).getImplementation().getReferences().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - - } - -} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java deleted file mode 100644 index 7696b64f9c..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java +++ /dev/null @@ -1,86 +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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - - -public class WARAppcompContribImplicitTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - /** - * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending - * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and - * to get a reference to the contribution service - */ - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * WAR - It's a WAR - * Appcomp - It has an application composite - * Contrib - It's a contribution in it's own right - * Implicit - Composite deployment is implicit - * - */ - @Test - public void testWARAppcompContribImplicit() throws Exception { - URL contributionLocation = new File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-06-war-appcomp-contrib-implicit.war").toURL(); - contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(CONTRIBUTION_001_ID)); - } - -} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java deleted file mode 100644 index f54a4f98df..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java +++ /dev/null @@ -1,110 +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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - - -public class WarAppcompTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * EJB - It's an JEE EAR file that is a contribution - * appcomp - It has an application composite in it - * - */ - @Test - public void testEjbAppcom() throws Exception { - - URL contributionLocation = new File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-06-war-appcomp-contrib-implicit.war").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - Assert.assertEquals(1, composite.getComponents().size()); - Assert.assertEquals(1, composite.getComponents().get(0).getImplementation().getReferences().size()); - Assert.assertEquals("helloworldSca", composite.getComponents().get(0).getImplementation().getReferences().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - - } - -} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear Binary files differdeleted file mode 100644 index 11d2a029ec..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear +++ /dev/null diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar Binary files differdeleted file mode 100644 index a5b160c875..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar +++ /dev/null diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear Binary files differdeleted file mode 100644 index 9fb1ed9d14..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear +++ /dev/null diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar Binary files differdeleted file mode 100644 index 3a704137ed..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar +++ /dev/null diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar Binary files differdeleted file mode 100644 index 228f4d27d7..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar +++ /dev/null diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war Binary files differdeleted file mode 100644 index 0b75db2745..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war +++ /dev/null diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war Binary files differdeleted file mode 100644 index 938ea75941..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war +++ /dev/null diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar Binary files differdeleted file mode 100644 index 24f55a5f63..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar +++ /dev/null diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app.ear b/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app.ear Binary files differdeleted file mode 100644 index c912e64237..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC1/itest/contribution-jee/src/test/resources/repository/simple-app.ear +++ /dev/null |