Start branch for 1.3.1, the only changes in this commit are for the version

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@684661 13f79535-47bb-0310-9956-ffa450edef68

17 files changed, 819 insertions, 0 deletions

diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/hello/Hello.java b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/hello/Hello.java
new file mode 100644
index 0000000000..7e574a7db3
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/hello/Hello.java
@@ -0,0 +1,27 @@
+/*
+ * 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 hello;
+
+/**
+ * This is the business interface of the Hello service.
+ */
+public interface Hello {
+
+    public String getGreetings(String name);
+}
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
new file mode 100644
index 0000000000..ff9f6e75f3
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
@@ -0,0 +1,33 @@
+/*
+ * 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 hello;
+
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements the HelloWorld service.
+ */
+@Service(Hello.class)
+public class HelloImpl implements Hello {
+
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+
+}
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
new file mode 100644
index 0000000000..c062afaed0
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
@@ -0,0 +1,38 @@
+/*
+ * 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 helloworld;
+
+import hello.Hello;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements the HelloWorld service.
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldImpl implements HelloWorldService {
+    @Reference
+    protected Hello helloServiceRef;
+
+    public String getGreetings(String name) {
+        return helloServiceRef.getGreetings(name);
+    }
+
+}
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..5251fc0a45
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
@@ -0,0 +1,28 @@
+/*
+ * 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 helloworld;
+
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+public interface HelloWorldService {
+
+    public String getGreetings(String name);
+}
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
new file mode 100644
index 0000000000..ec5123eb2d
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package test;
+
+import helloworld.HelloWorldService;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.apache.tuscany.sca.assembly.Composite;
+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 junit.framework.TestCase;
+
+/**
+ * Test multiple contributions scenario
+ * 
+ * FIXME This test case causes a StackOverflowException instead of
+ * reporting an error when a composite is not found, as there's a
+ * dependency cycle in the test contributions and the model resolvers
+ * do not handle import cycles properly.
+ * 
+ */
+public class ContributionCycleTestCaseFIXME extends TestCase {
+
+    private String helloContribution_dir = "target/test-classes/contribution-cycle-export";
+    private String helloWorldContribution_one_dir = "target/test-classes/contribution-cycle-import";
+
+    private ClassLoader cl;
+    private EmbeddedSCADomain domain;
+    private Contribution helloContribution;
+    private Contribution helloWorldContribution_one;
+
+    protected void setUp() throws Exception {
+        URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL();
+        URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL();
+
+        // Create a test embedded SCA domain
+        cl = getClass().getClassLoader();
+        domain = new EmbeddedSCADomain(cl, "http://localhost");
+
+        // Start the domain
+        domain.start();
+
+        // Contribute the SCA contribution
+        ContributionService contributionService = domain.getContributionService();
+
+        helloContribution =
+            contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false);
+        
+        for (Composite deployable : helloContribution.getDeployables()) {
+            domain.getDomainComposite().getIncludes().add(deployable);
+            domain.buildComposite(deployable);
+        }
+        for (Composite deployable : helloContribution.getDeployables()) {
+            domain.getCompositeActivator().activate(deployable);
+            domain.getCompositeActivator().start(deployable);
+        }
+
+        helloWorldContribution_one =
+            contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false);
+        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
+            domain.getDomainComposite().getIncludes().add(deployable);
+            domain.buildComposite(deployable);
+        }
+
+        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
+            domain.getCompositeActivator().activate(deployable);
+            domain.getCompositeActivator().start(deployable);
+        }
+
+    }
+
+    public void testServiceCall() throws IOException {
+        HelloWorldService helloWorldService_one =
+            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService");
+        assertNotNull(helloWorldService_one);
+
+        assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith"));
+
+    }
+
+    public void tearDown() throws Exception {
+        ContributionService contributionService = domain.getContributionService();
+
+        // Remove the contribution from the in-memory repository
+        contributionService.remove("http://contribution-multiple/helloworld");
+        contributionService.remove("http://contribution-multiple/helloworld_one");
+
+        // Stop Components from my composite
+        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
+            domain.getCompositeActivator().stop(deployable);
+            domain.getCompositeActivator().deactivate(deployable);
+        }
+        for (Composite deployable : helloContribution.getDeployables()) {
+            domain.getCompositeActivator().stop(deployable);
+            domain.getCompositeActivator().deactivate(deployable);
+        }
+        // domain.stop();
+        domain.close();
+    }
+
+}
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
new file mode 100644
index 0000000000..133c98f357
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package test;
+
+import helloworld.HelloWorldService;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.apache.tuscany.sca.assembly.Composite;
+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 junit.framework.TestCase;
+
+/**
+ * Test multiple contribution scenario
+ * Contributed by TUSCANY-1718
+ */
+public class ContributionMultipleTestCaseFIXME extends TestCase {
+
+    private String helloContribution_dir = "target/test-classes/contribution-export";
+    private String helloWorldContribution_one_dir = "target/test-classes/contribution-import-one";
+    private String helloWorldContribution_two_dir = "target/test-classes/contribution-import-two";
+
+    private ClassLoader cl;
+    private EmbeddedSCADomain domain;
+    private Contribution helloContribution;
+    private Contribution helloWorldContribution_one;
+    private Contribution helloWorldContribution_two;
+
+    protected void setUp() throws Exception {
+        URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL();
+        URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL();
+        URL helloWorldContribution_two_URL = new java.io.File(helloWorldContribution_two_dir).toURI().toURL();
+
+        // Create a test embedded SCA domain
+        cl = getClass().getClassLoader();
+        domain = new EmbeddedSCADomain(cl, "http://localhost");
+
+        // Start the domain
+        domain.start();
+
+        // Contribute the SCA contribution
+        ContributionService contributionService = domain.getContributionService();
+
+        helloContribution =
+            contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false);
+
+        helloWorldContribution_one =
+            contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false);
+
+        helloWorldContribution_two =
+            contributionService.contribute("http://contribution-multiple/helloworld_two", helloWorldContribution_two_URL, false);
+
+        for (Composite deployable : helloContribution.getDeployables()) {
+            domain.getDomainComposite().getIncludes().add(deployable);
+        }
+                
+        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
+            domain.getDomainComposite().getIncludes().add(deployable);
+        }
+
+        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
+            domain.getDomainComposite().getIncludes().add(deployable);
+        }
+
+        domain.buildComposite(domain.getDomainComposite());
+        domain.getCompositeActivator().activate(domain.getDomainComposite());
+        domain.getCompositeActivator().start(domain.getDomainComposite());
+
+    }
+
+    public void testServiceCall() throws IOException {
+        HelloWorldService helloWorldService_one =
+            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService");
+        assertNotNull(helloWorldService_one);
+
+        assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith"));
+
+        HelloWorldService helloWorldService_two =
+            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_two/HelloWorldService");
+        assertNotNull(helloWorldService_two);
+
+        assertEquals("Hello Smith", helloWorldService_two.getGreetings("Smith"));
+        
+    }
+
+    public void tearDown() throws Exception {
+        ContributionService contributionService = domain.getContributionService();
+
+        // Remove the contribution from the in-memory repository
+        contributionService.remove("http://contribution-multiple/helloworld");
+        contributionService.remove("http://contribution-multiple/helloworld_one");
+        contributionService.remove("http://contribution-multiple/helloworld_two");
+
+        // Stop Components from my composite
+        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
+            domain.getCompositeActivator().stop(deployable);
+            domain.getCompositeActivator().deactivate(deployable);
+        }        
+        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
+            domain.getCompositeActivator().stop(deployable);
+            domain.getCompositeActivator().deactivate(deployable);
+        }
+        for (Composite deployable : helloContribution.getDeployables()) {
+            domain.getCompositeActivator().stop(deployable);
+            domain.getCompositeActivator().deactivate(deployable);
+        }
+        // domain.stop();
+        domain.close();
+    }
+
+}
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
new file mode 100644
index 0000000000..790b6fed98
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package test;
+
+import helloworld.HelloWorldService;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.apache.tuscany.sca.assembly.Composite;
+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 junit.framework.TestCase;
+
+/**
+ * Test multiple contribution scenario
+ * Contributed by TUSCANY-1756
+ */
+public class ContributionTestCase extends TestCase {
+
+    private String helloContribution_dir = "target/test-classes/contribution-export";
+    //private String helloWorldContribution_one_dir = "target/test-classes/contribution-import-one";
+    private String helloWorldContribution_two_dir = "target/test-classes/contribution-import-two";
+
+    private ClassLoader cl;
+    private EmbeddedSCADomain domain;
+    private Contribution helloContribution;
+    //private Contribution helloWorldContribution_one;
+    private Contribution helloWorldContribution_two;
+
+    protected void setUp() throws Exception {
+        URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL();
+        //URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL();
+        URL helloWorldContribution_two_URL = new java.io.File(helloWorldContribution_two_dir).toURI().toURL();
+
+        // Create a test embedded SCA domain
+        cl = getClass().getClassLoader();
+        domain = new EmbeddedSCADomain(cl, "http://localhost");
+
+        // Start the domain
+        domain.start();
+
+        // Contribute the SCA contribution
+        ContributionService contributionService = domain.getContributionService();
+
+        helloContribution =
+            contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false);
+
+        //helloWorldContribution_one =
+         //   contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false);
+
+        helloWorldContribution_two =
+            contributionService.contribute("http://contribution-multiple/helloworld_two", helloWorldContribution_two_URL, false);
+
+        for (Composite deployable : helloContribution.getDeployables()) {
+            domain.getDomainComposite().getIncludes().add(deployable);
+            domain.buildComposite(deployable);
+        }
+
+        //for (Composite deployable : helloWorldContribution_one.getDeployables()) {
+        //    domain.getDomainComposite().getIncludes().add(deployable);
+        //    domain.buildComposite(deployable);
+        //}
+
+        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
+            domain.getDomainComposite().getIncludes().add(deployable);
+            domain.buildComposite(deployable);
+        }
+        
+        for (Composite deployable : helloContribution.getDeployables()) {
+            domain.getCompositeActivator().activate(deployable);
+            domain.getCompositeActivator().start(deployable);
+        }
+
+        //for (Composite deployable : helloWorldContribution_one.getDeployables()) {
+        //    domain.getCompositeActivator().activate(deployable);
+        //    domain.getCompositeActivator().start(deployable);
+        //}
+
+        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
+            domain.getCompositeActivator().activate(deployable);
+            domain.getCompositeActivator().start(deployable);
+        }        
+
+    }
+
+    public void testServiceCall() throws IOException {
+        //HelloWorldService helloWorldService_one =
+            //domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService");
+        //assertNotNull(helloWorldService_one);
+
+        //assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith"));
+
+        HelloWorldService helloWorldService_two =
+            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_two/HelloWorldService");
+        assertNotNull(helloWorldService_two);
+
+        assertEquals("Hello Smith", helloWorldService_two.getGreetings("Smith"));
+        
+    }
+
+    public void tearDown() throws Exception {
+        ContributionService contributionService = domain.getContributionService();
+
+        // Remove the contribution from the in-memory repository
+        contributionService.remove("http://contribution-multiple/helloworld");
+        //contributionService.remove("http://contribution-multiple/helloworld_one");
+        contributionService.remove("http://contribution-multiple/helloworld_two");
+
+        // Stop Components from my composite
+        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
+            domain.getCompositeActivator().stop(deployable);
+            domain.getCompositeActivator().deactivate(deployable);
+        }        
+        //for (Composite deployable : helloWorldContribution_one.getDeployables()) {
+        //    domain.getCompositeActivator().stop(deployable);
+        //    domain.getCompositeActivator().deactivate(deployable);
+        //}
+        for (Composite deployable : helloContribution.getDeployables()) {
+            domain.getCompositeActivator().stop(deployable);
+            domain.getCompositeActivator().deactivate(deployable);
+        }
+        // domain.stop();
+        domain.close();
+    }
+
+}
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..8b76783c3d
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	          targetNamespace="http://hello"
+              xmlns:hello="http://hello">
+   	<deployable composite="hello:hello"/>
+   	<export namespace="http://hello"/>
+   	<import namespace="http://hello"/>
+</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
new file mode 100644
index 0000000000..aeeab337fa
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	targetNamespace="http://hello"
+	xmlns:hello="http://hello"
+    name="hello">
+
+	<service name="HelloService" promote="HelloServiceComponent"/>
+	
+    <component name="HelloServiceComponent">
+        <implementation.java class="hello.HelloImpl" />
+    </component>
+
+</composite>
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..bfbf74373a
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	          targetNamespace="http://helloworld"
+              xmlns:helloworld="http://helloworld"
+              xmlns:hello="http://hello">
+   <deployable composite="helloworld:helloworld_one"/>
+   <import namespace="http://hello"/>
+</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
new file mode 100644
index 0000000000..7a8003577e
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	targetNamespace="http://helloworld"
+	xmlns:helloworld="http://helloworld"
+	xmlns:hello="http://hello"
+    name="helloworld_one">
+
+    <component name="SourceHelloServiceComponent_one">
+       <implementation.composite name="hello:helloexport"/>
+    </component>
+
+    <component name="HelloWorldServiceComponent_one">
+        <implementation.java class="helloworld.HelloWorldImpl" />
+        <reference name="helloServiceRef" target="SourceHelloServiceComponent_one/HelloService"/>
+    </component>
+
+</composite>
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..bea6f39932
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	          targetNamespace="http://hello"
+              xmlns:hello="http://hello">
+   	<deployable composite="hello:hello"/>
+   	<export namespace="http://hello"/>
+</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
new file mode 100644
index 0000000000..aeeab337fa
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	targetNamespace="http://hello"
+	xmlns:hello="http://hello"
+    name="hello">
+
+	<service name="HelloService" promote="HelloServiceComponent"/>
+	
+    <component name="HelloServiceComponent">
+        <implementation.java class="hello.HelloImpl" />
+    </component>
+
+</composite>
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..bfbf74373a
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	          targetNamespace="http://helloworld"
+              xmlns:helloworld="http://helloworld"
+              xmlns:hello="http://hello">
+   <deployable composite="helloworld:helloworld_one"/>
+   <import namespace="http://hello"/>
+</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
new file mode 100644
index 0000000000..45cb504ea4
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	targetNamespace="http://helloworld"
+	xmlns:helloworld="http://helloworld"
+	xmlns:hello="http://hello"
+    name="helloworld_one">
+
+    <component name="SourceHelloServiceComponent_one">
+       <implementation.composite name="hello:hello"/>
+    </component>
+
+    <component name="HelloWorldServiceComponent_one">
+        <implementation.java class="helloworld.HelloWorldImpl" />
+        <reference name="helloServiceRef" target="SourceHelloServiceComponent_one/HelloService"/>
+    </component>
+
+</composite>
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..cbabdcd4fc
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	          targetNamespace="http://helloworld"
+              xmlns:helloworld="http://helloworld"
+              xmlns:hello="http://hello">
+   <deployable composite="helloworld:helloworld_two"/>
+   <import namespace="http://hello"/>
+</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
new file mode 100644
index 0000000000..4c9225de34
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	targetNamespace="http://helloworld"
+	xmlns:helloworld="http://helloworld"
+	xmlns:hello="http://hello"
+    name="helloworld_two">
+
+    <component name="SourceHelloServiceComponent_two">
+       <implementation.composite name="hello:hello"/>
+    </component>
+
+    <component name="HelloWorldServiceComponent_two">
+        <implementation.java class="helloworld.HelloWorldImpl" />
+        <reference name="helloServiceRef" target="SourceHelloServiceComponent_two/HelloService"/>
+    </component>
+
+</composite>