summaryrefslogtreecommitdiffstats
path: root/tags/java/sca/1.5/itest/contribution-jee/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'tags/java/sca/1.5/itest/contribution-jee/src/test')
-rw-r--r--tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java329
-rw-r--r--tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java106
-rw-r--r--tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java134
-rw-r--r--tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java86
-rw-r--r--tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.earbin16071 -> 0 bytes
-rw-r--r--tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jarbin10764 -> 0 bytes
-rw-r--r--tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.earbin21310 -> 0 bytes
-rw-r--r--tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jarbin10740 -> 0 bytes
-rw-r--r--tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jarbin7711 -> 0 bytes
-rw-r--r--tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.warbin16238 -> 0 bytes
-rw-r--r--tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.warbin16209 -> 0 bytes
-rw-r--r--tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jarbin16204 -> 0 bytes
-rw-r--r--tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/simple-app.earbin16291 -> 0 bytes
13 files changed, 0 insertions, 655 deletions
diff --git a/tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java b/tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
deleted file mode 100644
index b81f67c287..0000000000
--- a/tags/java/sca/1.5/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/tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java b/tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
deleted file mode 100644
index 3674dc2638..0000000000
--- a/tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
+++ /dev/null
@@ -1,106 +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 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 testSCAJarEarNonenhanced() 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);
-
- Assert.assertEquals(2, composite.getComponents().size());
- Assert.assertEquals(1, composite.getComponents().get(1).getImplementation().getServices().size());
- Assert.assertEquals("TheService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName());
-
- }
-
-}
diff --git a/tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java b/tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
deleted file mode 100644
index 24556f0a4c..0000000000
--- a/tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
+++ /dev/null
@@ -1,134 +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(1, composite.getComponents().get(1).getImplementation().getServices().size());
- Assert.assertEquals("HelloworldServiceBean_HelloworldService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName());
- }
-
-}
diff --git a/tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java b/tags/java/sca/1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
deleted file mode 100644
index a59c6839fe..0000000000
--- a/tags/java/sca/1.5/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-6-war-appcomp-contrib-implicit.war").toURL();
- contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false);
- Assert.assertNotNull(contributionService.getContribution(CONTRIBUTION_001_ID));
- }
-
-}
diff --git a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear b/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
deleted file mode 100644
index 11d2a029ec..0000000000
--- a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
+++ /dev/null
Binary files differ
diff --git a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar b/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
deleted file mode 100644
index a5b160c875..0000000000
--- a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
+++ /dev/null
Binary files differ
diff --git a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear b/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
deleted file mode 100644
index 9fb1ed9d14..0000000000
--- a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
+++ /dev/null
Binary files differ
diff --git a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar b/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
deleted file mode 100644
index 3a704137ed..0000000000
--- a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
+++ /dev/null
Binary files differ
diff --git a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar b/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
deleted file mode 100644
index 228f4d27d7..0000000000
--- a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
+++ /dev/null
Binary files differ
diff --git a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war b/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
deleted file mode 100644
index 0b75db2745..0000000000
--- a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
+++ /dev/null
Binary files differ
diff --git a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war b/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
deleted file mode 100644
index 938ea75941..0000000000
--- a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
+++ /dev/null
Binary files differ
diff --git a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar b/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
deleted file mode 100644
index 24f55a5f63..0000000000
--- a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
+++ /dev/null
Binary files differ
diff --git a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear b/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear
deleted file mode 100644
index c912e64237..0000000000
--- a/tags/java/sca/1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear
+++ /dev/null
Binary files differ