summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.0.1/itest/recursive/src
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.0.1/itest/recursive/src')
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/CompositeClient.java42
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/Source.java24
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/SourceCallback.java24
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/SourceImpl.java55
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/Target.java30
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/TargetImpl.java41
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentAImpl.java41
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentCImpl.java41
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentEImpl.java38
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentFImpl.java45
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/Service1.java27
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/test/Aggregator.java27
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/test/AggregatorImpl.java55
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/test/InnerSourceImpl.java34
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/test/OuterSourceImpl.java34
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/test/Source.java30
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/Target.java23
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/TargetOne.java29
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/TargetTwo.java29
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite1.composite42
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite2.composite43
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite3.composite48
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/resources/Inner.composite45
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/resources/InnerComposite.composite41
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/resources/InnerComposite2.composite33
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/resources/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/resources/Outer.composite39
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/resources/OuterComposite.composite39
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/resources/test1/InnerComposite.composite39
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/main/resources/test1/OuterComposite.composite27
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/CompositeTestCase.java51
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java113
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java73
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java53
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/test/java/test/InnerTestCase.java51
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/test/java/test/OuterTestCase.java51
-rw-r--r--branches/sca-java-1.0.1/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java38
37 files changed, 0 insertions, 1519 deletions
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/CompositeClient.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/CompositeClient.java
deleted file mode 100644
index 5edc305970..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/CompositeClient.java
+++ /dev/null
@@ -1,42 +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 composite;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Simple client program that invokes the components that we wired together.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeClient {
-
- public static void main(String[] args) throws Exception {
- SCADomain domain = SCADomain.newInstance("OuterComposite.composite");
-
- Source source = domain.getService(Source.class, "SourceComponent");
-
- System.out.println("Main thread " + Thread.currentThread());
- source.clientMethod("Client.main");
- Thread.sleep(500);
-
- domain.close();
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/Source.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/Source.java
deleted file mode 100644
index d0efcc1df1..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/Source.java
+++ /dev/null
@@ -1,24 +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 composite;
-
-public interface Source {
-
- void clientMethod(String arg);
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/SourceCallback.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/SourceCallback.java
deleted file mode 100644
index baa95a8e39..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/SourceCallback.java
+++ /dev/null
@@ -1,24 +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 composite;
-
-public interface SourceCallback {
-
- void receiveResult(String result);
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/SourceImpl.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/SourceImpl.java
deleted file mode 100644
index b9a0c7ff74..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/SourceImpl.java
+++ /dev/null
@@ -1,55 +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 composite;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-@Service(Source.class)
-@Scope("COMPOSITE")
-public class SourceImpl implements Source, SourceCallback {
-
- private Target targetReference;
- private Target targetReference2;
-
- @Reference
- public void setTargetReference(Target target) {
- this.targetReference = target;
- }
-
- @Reference
- public void setTargetReference2(Target target) {
- this.targetReference2 = target;
- }
-
- public void clientMethod(String arg) {
- System.out.println("Source: " + arg + " -> Source.clientMethod");
- targetReference.someMethod(arg + " -> Source.clientMethod");
-
- System.out.println("Source: " + arg + " => Source.clientMethod2");
- targetReference2.someMethod(arg + " => Source.clientMethod2");
- }
-
- public void receiveResult(String result) {
- System.out.println("Work thread " + Thread.currentThread());
- System.out.println("Result: " + result);
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/Target.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/Target.java
deleted file mode 100644
index 9a8f68a7fa..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/Target.java
+++ /dev/null
@@ -1,30 +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 composite;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-
-
-@Callback(SourceCallback.class)
-public interface Target {
-
- @OneWay
- void someMethod(String arg);
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/TargetImpl.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/TargetImpl.java
deleted file mode 100644
index 86686e9233..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/TargetImpl.java
+++ /dev/null
@@ -1,41 +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 composite;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-@Service(Target.class)
-@Scope("COMPOSITE")
-public class TargetImpl implements Target {
-
- private SourceCallback sourceCallback;
-
- @Callback
- public void setSourceCallback(SourceCallback sourceCallback) {
- this.sourceCallback = sourceCallback;
- }
-
- public void someMethod(String arg) {
- System.out.println("Target: " + arg);
- sourceCallback.receiveResult(arg + " -> Target.someMethod");
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentAImpl.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentAImpl.java
deleted file mode 100644
index f513949105..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentAImpl.java
+++ /dev/null
@@ -1,41 +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 sample;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Service1.class)
-public class ComponentAImpl implements Service1 {
-
- @Reference(name = "Reference1", required = false)
- protected Service1 ref;
-
- public String track(String source) {
- if (ref != null) {
- return ref.track(source + "-->ComponentA");
- }
- return source + "-->ComponentA";
- }
-
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentCImpl.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentCImpl.java
deleted file mode 100644
index 586a9ee6a7..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentCImpl.java
+++ /dev/null
@@ -1,41 +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 sample;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Service1.class)
-public class ComponentCImpl implements Service1 {
-
- @Reference(name = "Reference1", required = false)
- protected Service1 ref;
-
- public String track(String source) {
- if (ref != null) {
- return ref.track(source + "-->ComponentC");
- }
- return source + "-->ComponentC";
- }
-
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentEImpl.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentEImpl.java
deleted file mode 100644
index dbf2735aa7..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentEImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package sample;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComponentEImpl implements Service1 {
- @Property(name = "Property1")
- protected String prefix;
-
- @Reference(name = "Reference1")
- protected Service1 ref;
-
- public String track(String source) {
- return ref.track(source + "-->ComponentE");
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentFImpl.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentFImpl.java
deleted file mode 100644
index 5e136e536c..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentFImpl.java
+++ /dev/null
@@ -1,45 +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 sample;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComponentFImpl implements Service1 {
-
- private Service1 ref;
-
- public String track(String source) {
- if (ref != null) {
- return ref.track(source + "-->ComponentF");
- } else {
- System.err.println("Reference1 is not wired...");
- return source + "-->ComponentF";
- }
- }
-
- @Reference(name = "Reference1")
- public void setComponentA(Service1 ref) {
- this.ref = ref;
- }
-
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/Service1.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/Service1.java
deleted file mode 100644
index 81bdce79f1..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/Service1.java
+++ /dev/null
@@ -1,27 +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 sample;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface Service1 {
- String track(String source);
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/Aggregator.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/Aggregator.java
deleted file mode 100644
index 88b3bed1b2..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/Aggregator.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package test;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface Aggregator {
- String getAggregatedData();
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/AggregatorImpl.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/AggregatorImpl.java
deleted file mode 100644
index f6ac6c8741..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/AggregatorImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package test;
-
-import java.util.List;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Aggregator.class)
-public class AggregatorImpl implements Aggregator {
-
- @Reference(name = "uniSource")
- protected Source source;
-
- @Reference(name = "multiSource")
- protected List<Source> sources;
-
- public String getAggregatedData() {
- System.out.println("uniSource: " + source.getData());
- StringBuffer sb = new StringBuffer();
- int i = 0;
- for (Source s : sources) {
- if (i != 0) {
- sb.append(", ");
- } else {
- sb.append("multiSource: ");
- }
- sb.append(s.getData());
- i++;
- }
- return sb.toString();
- }
-
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/InnerSourceImpl.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/InnerSourceImpl.java
deleted file mode 100644
index c8dad5ae35..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/InnerSourceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package test;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Source.class)
-public class InnerSourceImpl implements Source {
-
- public String getData() {
- return "InnerSource";
- }
-
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/OuterSourceImpl.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/OuterSourceImpl.java
deleted file mode 100644
index 11816e82cf..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/OuterSourceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package test;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Source.class)
-public class OuterSourceImpl implements Source {
-
- public String getData() {
- return "OuterSource";
- }
-
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/Source.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/Source.java
deleted file mode 100644
index 9b93740d9d..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test/Source.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package test;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface Source {
- String getData();
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/Target.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/Target.java
deleted file mode 100644
index 4883e12f49..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/Target.java
+++ /dev/null
@@ -1,23 +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 test1.composite;
-
-public interface Target {
- String hello(String arg);
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/TargetOne.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/TargetOne.java
deleted file mode 100644
index a7c68f4ffd..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/TargetOne.java
+++ /dev/null
@@ -1,29 +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 test1.composite;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetOne implements Target {
-
- public String hello(String arg) {
- return "TargetOne: Hello " + arg + "!";
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/TargetTwo.java
deleted file mode 100644
index 7fff8e2e9b..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/TargetTwo.java
+++ /dev/null
@@ -1,29 +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 test1.composite;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetTwo implements Target {
-
- public String hello(String arg) {
- return "TargetTwo: Hello " + arg + "!";
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite1.composite b/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite1.composite
deleted file mode 100644
index 56fd7c621f..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite1.composite
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Composite1">
-
- <component name="ComponentA">
- <implementation.java class="sample.ComponentAImpl"/>
- </component>
-
- <component name="ComponentB">
- <!-- Implemented by Composite3 -->
- <implementation.composite name="sample:Composite3"/>
-
- <!-- Wired to ComponentA -->
- <reference name="Reference1" target="ComponentA"/>
-
- <property name="Property1">ABC</property>
- </component>
-
- <!-- ComponentB.Service1 is promoted -->
- <service name="Service1" promote="ComponentB/Service1" />
-
-</composite>
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite2.composite b/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite2.composite
deleted file mode 100644
index 54f10673a4..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite2.composite
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Composite2">
-
- <component name="ComponentC">
- <implementation.java class="sample.ComponentCImpl" />
-
- <!-- Wired to ComponentD.Service1 -->
- <reference name="Reference1" target="ComponentD/Service1" />
- </component>
-
- <component name="ComponentD">
- <!-- Implemented by Composite3 -->
- <implementation.composite name="sample:Composite3" />
-
- <!-- The property value is "XYZ" -->
- <property name="Property1">XYZ</property>
- </component>
-
- <!-- ComponentD.Reference1 is promoted -->
- <reference name="Reference1" promote="ComponentD/Reference1" />
-
-</composite>
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite3.composite b/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite3.composite
deleted file mode 100644
index 040653493f..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite3.composite
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="Composite3">
-
- <component name="ComponentE">
- <implementation.java class="sample.ComponentEImpl" />
- <reference name="Reference1" target="ComponentF/Service1" />
-
- <!-- The property is from the composite Property1 -->
- <property name="Property1" source="$Property1" />
- </component>
-
- <component name="ComponentF">
- <implementation.java class="sample.ComponentFImpl" />
- </component>
-
- <service name="Service1" promote="ComponentE/Service1" />
-
- <reference name="Reference1" promote="ComponentF/Reference1">
- <!--
- <binding.sca />
- -->
- </reference>
-
- <property name="Property1" type="xsd:string">123</property>
-
-</composite>
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Inner.composite b/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Inner.composite
deleted file mode 100644
index 398ebdf6e2..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Inner.composite
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://test"
- xmlns:sample="http://test"
- name="Inner">
-
- <component name="Aggregator">
- <implementation.java class="test.AggregatorImpl"/>
- <reference name="uniSource" target="InnerSource/Source"/>
- <reference name="multiSource" target="InnerSource/Source"/>
- </component>
-
- <component name="InnerSource">
- <implementation.java class="test.InnerSourceImpl"/>
- </component>
-
- <reference name="uniSource" promote="Aggregator/uniSource">
- <binding.sca/>
- </reference>
-
- <reference name="multiSource" promote="Aggregator/multiSource">
- <binding.sca/>
- </reference>
-
- <service name="aggregator" promote="Aggregator"/>
-
-</composite>
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/InnerComposite.composite b/branches/sca-java-1.0.1/itest/recursive/src/main/resources/InnerComposite.composite
deleted file mode 100644
index 3376ac8ff5..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/InnerComposite.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="InnerComposite">
-
- <service name="InnerSourceService" promote="InnerSourceComponent">
- <interface.java interface="composite.Source"/>
- </service>
-
- <component name="InnerSourceComponent">
- <implementation.java class="composite.SourceImpl"/>
- </component>
-
- <reference name="targetComponentRef" promote="InnerSourceComponent/targetReference">
- <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
- </reference>
-
- <reference name="targetComponentRef2" promote="InnerSourceComponent/targetReference2">
- <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/InnerComposite2.composite b/branches/sca-java-1.0.1/itest/recursive/src/main/resources/InnerComposite2.composite
deleted file mode 100644
index c9eff4fa9d..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/InnerComposite2.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="InnerComposite2">
-
- <service name="InnerTargetService" promote="InnerTargetComponent">
- <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
- </service>
-
- <component name="InnerTargetComponent">
- <implementation.java class="composite.TargetImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.0.1/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 289b92a3f2..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:OuterComposite"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Outer.composite b/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Outer.composite
deleted file mode 100644
index 987990d854..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/Outer.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://test"
- xmlns:test="http://test"
- name="Outer">
-
- <component name="OuterSource">
- <implementation.java class="test.OuterSourceImpl"/>
- </component>
-
- <component name="Inner">
- <!-- Implemented by Composite3 -->
- <implementation.composite name="test:Inner"/>
-
- <reference name="uniSource" target="OuterSource"/>
-
- <reference name="multiSource" target="OuterSource"/>
-
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/OuterComposite.composite b/branches/sca-java-1.0.1/itest/recursive/src/main/resources/OuterComposite.composite
deleted file mode 100644
index cb1c1e13d4..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/OuterComposite.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="OuterComposite">
-
- <component name="SourceComponent">
- <implementation.composite name="sample:InnerComposite"/>
- <reference name="targetComponentRef" target="TargetComponent"/>
- <reference name="targetComponentRef2" target="TargetComponent2/InnerTargetService"/>
- </component>
-
- <component name="TargetComponent">
- <implementation.java class="composite.TargetImpl"/>
- </component>
-
- <component name="TargetComponent2">
- <implementation.composite name="sample:InnerComposite2"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/test1/InnerComposite.composite b/branches/sca-java-1.0.1/itest/recursive/src/main/resources/test1/InnerComposite.composite
deleted file mode 100644
index 177fa10550..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/test1/InnerComposite.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample1"
- xmlns:sample1="http://sample1"
- name="InnerComposite">
-
- <service name="Service_One" promote="ComponentOne">
- <interface.java interface="test1.composite.Target"/>
- </service>
- <service name="Service_Two" promote="ComponentTwo">
- <interface.java interface="test1.composite.Target"/>
- </service>
-
- <component name="ComponentOne">
- <implementation.java class="test1.composite.TargetOne"/>
- </component>
- <component name="ComponentTwo">
- <implementation.java class="test1.composite.TargetTwo"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/test1/OuterComposite.composite b/branches/sca-java-1.0.1/itest/recursive/src/main/resources/test1/OuterComposite.composite
deleted file mode 100644
index 6253533e01..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/main/resources/test1/OuterComposite.composite
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample1"
- xmlns:sample1="http://sample1"
- name="OuterComposite">
- <component name="TargetComponent">
- <implementation.composite name="sample1:InnerComposite"/>
- </component>
-</composite>
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/CompositeTestCase.java b/branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/CompositeTestCase.java
deleted file mode 100644
index 5482e47463..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/CompositeTestCase.java
+++ /dev/null
@@ -1,51 +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 composite;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CompositeTestCase extends TestCase {
-
- private SCADomain domain;
- private Source source;
-
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("OuterComposite.composite");
- source = domain.getService(Source.class, "SourceComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-
- public void test() throws Exception {
- try {
- System.out.println("Main thread " + Thread.currentThread());
- source.clientMethod("Client.main");
- System.out.println("Sleeping ...");
- Thread.sleep(1000);
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
deleted file mode 100644
index c0605a0db0..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
+++ /dev/null
@@ -1,113 +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 composite;
-
-import java.io.File;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-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;
-
-public class LocateServiceEmbeddedSCADomainTestCase extends TestCase {
- private ClassLoader cl;
- private EmbeddedSCADomain domain;
- private Contribution contribution;
-
- @Override
- protected void setUp() throws Exception {
- // 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();
-
- File contribLocation = new File("./target/classes/");
- URL contributionURL = contribLocation.toURL();
- contribution = contributionService.contribute("http://contribution", contributionURL, false);
- for (Composite deployable : contribution.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
- }
-
- // Start Components from my composite
- for (Composite deployable : contribution.getDeployables() ) {
- domain.getCompositeActivator().activate(deployable);
- domain.getCompositeActivator().start(deployable);
- }
- }
-
- public void testValidLocateService() throws Exception {
- Source source;
- try {
- source = domain.getService(Source.class, "SourceComponent");
- assertNotNull(source);
- } catch (Throwable t) {
- fail("Could not locate service");
- }
- }
-
- public void testInvalidLocateService() throws Exception {
- Source source;
- try {
- source = domain.getService(Source.class, "SourceComponentXXX");
- // The source proxy can be created for the remote target but it will throw exception when a method is invoked
- source.clientMethod("ABC");
- fail("Expected to generate org.osoa.sca.ServiceRuntimeException but did not when invoking service with async");
- } catch (org.osoa.sca.ServiceRuntimeException e) {
- // expected.
- }
- }
-
- public void testValidRecursiveLocateService() throws Exception {
- Source source;
- try {
- source = domain.getService(Source.class, "SourceComponent/InnerSourceService");
- assertNotNull(source);
- } catch (Throwable t) {
- fail("Could not locate service");
- }
- }
-
- @Override
- public void tearDown() throws Exception {
- ContributionService contributionService = domain.getContributionService();
-
- // Remove the contribution from the in-memory repository
- contributionService.remove("http://contribution");
-
- // Stop Components from my composite
- for (Composite deployable : contribution.getDeployables() ) {
- domain.getCompositeActivator().stop(deployable);
- domain.getCompositeActivator().deactivate(deployable);
- }
-
- domain.stop();
- domain.close();
- }
-
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
deleted file mode 100644
index 87eb948452..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
+++ /dev/null
@@ -1,73 +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 composite;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class LocateServiceSCADomainTestCase extends TestCase {
-
- private SCADomain domain;
-
-
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("OuterComposite.composite");
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-
- public void testValidLocateService() throws Exception {
- Source source;
- try {
- source = domain.getService(Source.class, "SourceComponent");
- assertNotNull(source);
- } catch (Throwable t) {
- fail("Could not locate service");
- }
- }
-
- public void testInvalidLocateService() throws Exception {
- Source source;
- try {
- source = domain.getService(Source.class, "SourceComponentXXX");
- // The source proxy can be created for the remote target but it will throw exception when a method is invoked
- source.clientMethod("ABC");
- fail("Expected to generate org.osoa.sca.ServiceRuntimeException but did not when invoking service with async");
- } catch (org.osoa.sca.ServiceRuntimeException e) {
- // expected.
- }
- }
-
- public void testValidRecursiveLocateService() throws Exception {
- Source source;
- try {
- source = domain.getService(Source.class, "SourceComponent/InnerSourceService");
- assertNotNull(source);
- } catch (Throwable t) {
- fail("Could not locate service");
- }
- }
-
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java b/branches/sca-java-1.0.1/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
deleted file mode 100644
index a543add69b..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
+++ /dev/null
@@ -1,53 +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 sample;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-//FIXME Fix this test case
-public class RecursiveCompositeTestCaseFIXME extends TestCase {
-
- private SCADomain domain;
- private Service1 tracker, tracker2;
-
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("http://localhost", "/", "Composite1.composite", "Composite2.composite");
- tracker = domain.getService(Service1.class, "ComponentC");
- tracker2 = domain.getService(Service1.class, "ComponentB");
-
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-
- public void test() throws Exception {
- try {
- System.out.println("Main thread " + Thread.currentThread());
- System.out.println(tracker.track("Client"));
- System.out.println(tracker2.track("Client"));
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/test/java/test/InnerTestCase.java b/branches/sca-java-1.0.1/itest/recursive/src/test/java/test/InnerTestCase.java
deleted file mode 100644
index ebb4bc7acb..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/test/java/test/InnerTestCase.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class InnerTestCase extends TestCase {
-
- private SCADomain domain;
- private Aggregator aggregator;
-
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("Inner.composite");
- aggregator = domain.getService(Aggregator.class, "Aggregator");
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-
- public void test() throws Exception {
- try {
- String result = aggregator.getAggregatedData();
- assertTrue(result.contains("InnerSource"));
- assertTrue(result.contains("InnerSource"));
- System.out.println(result);
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/test/java/test/OuterTestCase.java b/branches/sca-java-1.0.1/itest/recursive/src/test/java/test/OuterTestCase.java
deleted file mode 100644
index 17de5ca4a8..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/test/java/test/OuterTestCase.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class OuterTestCase extends TestCase {
-
- private SCADomain domain;
- private Aggregator aggregator;
-
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("Outer.composite");
- aggregator = domain.getService(Aggregator.class, "Inner");
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-
- public void test() throws Exception {
- try {
- String result = aggregator.getAggregatedData();
- assertTrue(result.contains("InnerSource"));
- assertTrue(result.contains("OuterSource"));
- System.out.println(result);
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java b/branches/sca-java-1.0.1/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
deleted file mode 100644
index ab3e625ae5..0000000000
--- a/branches/sca-java-1.0.1/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package test1.composite;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Simple client program that invokes the components that we wired together.
- */
-public class CompositeClientTestCase extends TestCase {
-
- public void testComposite() throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("test1/OuterComposite.composite");
- Target target = scaDomain.getService(Target.class, "TargetComponent/Service_Two");
- String res = target.hello("Wang Feng");
- assertEquals("TargetTwo: Hello Wang Feng!", res);
- scaDomain.close();
- }
-}