summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5/vtest/assembly/composite/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.5/vtest/assembly/composite/src/main')
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java30
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java28
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java31
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java30
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java32
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java30
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java49
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java31
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java47
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java31
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java32
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java30
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java33
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java49
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java37
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java41
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java37
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java45
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java36
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java32
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java43
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java31
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java46
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/composite.composite30
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositeb.composite31
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositec.composite32
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositecopy.composite32
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite39
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite32
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentlocalwire.composite53
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite42
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite37
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite39
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite32
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/dservicews.composite33
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/localcomponent.composite39
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite43
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite31
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite38
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite44
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite42
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite31
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite34
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite42
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite41
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite31
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_inner.composite34
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_outer.composite42
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_inner.composite42
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_outer.composite32
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subinterfacewire.composite53
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite43
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite41
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite39
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite31
-rw-r--r--branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/wire.composite53
56 files changed, 0 insertions, 2089 deletions
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
deleted file mode 100644
index 506e79b793..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.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 org.apache.tuscany.sca.vtest.assembly.composite;
-
-/**
- * Simple Remotable Service
- */
-public interface AService {
-
- public String getState();
- public String getBProperty();
-
-
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
deleted file mode 100644
index 61b4293940..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.assembly.composite;
-
-/**
- * Simple Service
- */
-public interface BService {
-
- public String getSomeProperty();
-
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
deleted file mode 100644
index 6d2c7e5963..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.assembly.composite;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- *
- */
-public interface CService extends CSubService{
-
- public String getState();
- public String getName();
-
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java
deleted file mode 100644
index 8333d69c9e..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.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 org.apache.tuscany.sca.vtest.assembly.composite;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- *
- */
-public interface CSubService {
-
- public String getState();
-
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java
deleted file mode 100644
index 7424fd215c..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.assembly.composite;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- *
- */
-public interface CSuperService extends CService{
-
- public String getState();
- public String getName();
- public String getString();
-
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java
deleted file mode 100644
index 7e61beec62..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.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 org.apache.tuscany.sca.vtest.assembly.composite;
-
-
-/**
- * Simple Local service.
- */
-
-public interface DLocalSubService {
-
- public String getGreetings(String name);
- public String getSomeProperty();
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java
deleted file mode 100644
index 058726dbd7..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.assembly.composite;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This server program shows how to create an SCA runtime, and start it which
- * activates the helloworld Web service endpoint.
- */
-public class DServer {
-
- public static void main(String[] args) {
-
-
- SCADomain scaDomain = SCADomain.newInstance("dservicews.composite");
-
- try {
- System.out.println("HelloWorld server started (press enter to shutdown)");
- System.in.read();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- scaDomain.close();
- System.out.println("HelloWorld server stopped");
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
deleted file mode 100644
index 3c41255657..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.assembly.composite;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable service.
- */
-@Remotable
-public interface DService {
-
- public String getGreetings(String name);
- public String getSomeProperty();
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
deleted file mode 100644
index a32b72b7de..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.assembly.composite;
-
-import org.osoa.sca.annotations.Scope;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate the HelloWorld service and invoke it.
- */
-@Scope("COMPOSITE")
-public class DServiceComponent implements DService {
-
- DService helloWorldService;
-
- public String getGreetings(String name) {
- return helloWorldService.getGreetings(name);
- }
-
- public String getSomeProperty() {
- return helloWorldService.getSomeProperty();
- }
-
- public DService getHelloWorldService() {
- return helloWorldService;
- }
-
- public void setHelloWorldService(DService helloWorldService) {
- this.helloWorldService = helloWorldService;
- }
-} \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java
deleted file mode 100644
index 4a87abb98a..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.assembly.composite;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable service.
- */
-@Remotable
-public interface DSubService {
-
- //public String getGreetings(String name);
- public String getSomeProperty();
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java
deleted file mode 100644
index 95e7e1ef75..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.assembly.composite;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable service.
- */
-@Remotable
-public interface DSuperService {
-
- public String getGreetings(String name);
- public String getSomeProperty();
- public String getString();
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java
deleted file mode 100644
index c39dde6c89..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.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 org.apache.tuscany.sca.vtest.assembly.composite;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable service.
- */
-@Remotable
-public interface EService {
-
- public String getString(String a);
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
deleted file mode 100644
index 5b67c87ee1..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.assembly.composite;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-public interface FService {
-
- public String getString(String a);
- public String getGreetings(String name);
-
-
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
deleted file mode 100644
index a9d4a1c872..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.assembly.composite.impl;
-
-import org.apache.tuscany.sca.vtest.assembly.composite.AService;
-import org.apache.tuscany.sca.vtest.assembly.composite.BService;
-import org.apache.tuscany.sca.vtest.assembly.composite.CService;
-import org.apache.tuscany.sca.vtest.assembly.composite.DService;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
- @Reference
- protected BService b;
-
- @Reference
- protected CService c;
-
- public String getState() {
- return c.getState();
- }
-
- public String getBProperty() {
- return b.getSomeProperty();
- }
-
-
-
-}
-
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
deleted file mode 100644
index b651f21927..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.assembly.composite.impl;
-
-import org.apache.tuscany.sca.vtest.assembly.composite.BService;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
- @Property
- protected String someProperty;
-
-
- public String getSomeProperty() {
- return someProperty;
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
deleted file mode 100644
index 3c23e3887a..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.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 org.apache.tuscany.sca.vtest.assembly.composite.impl;
-
-import org.osoa.sca.annotations.Service;
-import org.apache.tuscany.sca.vtest.assembly.composite.CService;
-
-@Service(CService.class)
-
-public class CServiceImpl implements CService{
-
- private String state = "Some State";
- private String name = "CServiceImpl";
-
- public String getState() {
- return state;
- }
-
- public String getName() {
- return name;
- }
-
-}
-
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java
deleted file mode 100644
index e307302395..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.assembly.composite.impl;
-
-import org.osoa.sca.annotations.Service;
-import org.apache.tuscany.sca.vtest.assembly.composite.CSubService;
-
-@Service(CSubService.class)
-
-public class CSubServiceImpl implements CSubService{
-
- private String state = "Some State";
-
- public String getState() {
- return state;
- }
-
-
-}
-
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java
deleted file mode 100644
index 77b8dbc526..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.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 org.apache.tuscany.sca.vtest.assembly.composite.impl;
-
-import org.osoa.sca.annotations.Service;
-import org.apache.tuscany.sca.vtest.assembly.composite.CSuperService;
-
-@Service(CSuperService.class)
-
-public class CSuperServiceImpl implements CSuperService{
-
- private String state = "Some State";
- private String name = "CServiceImpl";
-
- public String getState() {
- return state;
- }
-
- public String getName() {
- return name;
- }
-
- public String getString() {
- return name;
- }
-
-}
-
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java
deleted file mode 100644
index 6d683be9f7..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.assembly.composite.impl;
-
-import org.apache.tuscany.sca.vtest.assembly.composite.DService;
-import org.osoa.sca.annotations.Service;
-
-@Service(DService.class)
-public class DServiceImpl implements DService {
-
- public String getGreetings(String name) {
- return "Hello, " + name;
- }
-
- public String getSomeProperty()
- {
- return "DProperty";
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java
deleted file mode 100644
index e1ee25c88b..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.assembly.composite.impl;
-
-import org.apache.tuscany.sca.vtest.assembly.composite.DSubService;
-import org.osoa.sca.annotations.Service;
-
-@Service(DSubService.class)
-public class DSubServiceImpl implements DSubService {
-
- public String getSomeProperty()
- {
- return "DProperty";
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java
deleted file mode 100644
index a030170fb5..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.assembly.composite.impl;
-
-
-import org.apache.tuscany.sca.vtest.assembly.composite.DSuperService;
-import org.osoa.sca.annotations.Service;
-
-@Service(DSuperService.class)
-public class DSuperServiceImpl implements DSuperService {
-
- public String getGreetings(String name) {
- return "Hello, " + name;
- }
-
- public String getSomeProperty()
- {
- return "DProperty";
- }
-
- public String getString() {
- // TODO Auto-generated method stub
- return "DSuperServiceImpl";
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java
deleted file mode 100644
index 1439bd5ca2..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.assembly.composite.impl;
-
-import org.apache.tuscany.sca.vtest.assembly.composite.EService;
-import org.osoa.sca.annotations.Service;
-
-@Service(EService.class)
-public class EServiceImpl implements EService {
-
- public String getString(String a) {
- return a;
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java
deleted file mode 100644
index 262f46b40a..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.assembly.composite.impl;
-
-import org.apache.tuscany.sca.vtest.assembly.composite.FService;
-import org.apache.tuscany.sca.vtest.assembly.composite.CService;
-import org.apache.tuscany.sca.vtest.assembly.composite.DService;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(FService.class)
-public class FServiceImpl implements FService {
-
- @Reference
- protected CService c;
-
- @Reference
- protected DService d;
-
- public String getString(String a) {
- return c.getState();
- }
-
- public String getGreetings(String name) {
- return d.getSomeProperty();
- }
-
-}
-
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/composite.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/composite.composite
deleted file mode 100644
index 72b511232f..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/composite.composite
+++ /dev/null
@@ -1,30 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests"
- name="Assembly-composite--Composite">
-
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
- <property name="someProperty">some b component value</property>
- </component>
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositeb.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositeb.composite
deleted file mode 100644
index 694e9917a7..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositeb.composite
+++ /dev/null
@@ -1,31 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests"
- name="Assembly-composite-b--Composite">
-
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
- <property name="someProperty">some b component value</property>
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositec.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositec.composite
deleted file mode 100644
index e5588cb9f9..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositec.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests"
- name="Assembly-composite-c--Composite">
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- <service name="CService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositecopy.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositecopy.composite
deleted file mode 100644
index a01b897dcf..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositecopy.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests"
- name="Assembly-composite--Composite">
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- <service name="CService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
deleted file mode 100644
index e9cf2710d3..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_inner.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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-different-interface-inner-Composite">
-
- <service name="DifferentInterfaceService" promote="CComponent">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.BService">
- </interface.java>
- </service>
-
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- <service name="CServiceImpl">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
deleted file mode 100644
index ccbdcefcf1..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-outer-Composite">
-
- <component name="DifferentInterfaceComponent">
-
- <implementation.composite name="assembly-tests:Assembly-different-interface-inner-Composite"/>
-
- </component>
-</composite>
-
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentlocalwire.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
deleted file mode 100644
index c418f912ce..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
+++ /dev/null
@@ -1,53 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests"
- name="Assembly-different-local-wire--Composite">
-
- <component name="FComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.FServiceImpl"/>
- <reference name="d">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DLocalSubService" />
- </reference>
- <reference name="c">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService" />
- </reference>
- </component>
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- <service name="CService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
- </service>
- </component>
-
-
- <component name="DComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.DServiceImpl"/>
- <service name="DService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DService" />
- </service>
- </component>
-
- <wire source="FComponent/d" target="DComponent" />
- <wire source="FComponent/c" target="CComponent" />
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
deleted file mode 100644
index 038702720f..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-different-reference-interface-inner-Composite">
-
- <service name="AService" promote="AComponent"/>
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.assembly.composite.impl.AServiceImpl" />
- <reference name="b">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.BService" />
- </reference>
- </component>
-
- <reference name="c" promote="AComponent/b">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService" />
- </reference>
-
-
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
deleted file mode 100644
index 43fb488282..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
+++ /dev/null
@@ -1,37 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-different-reference-interface-outer-Composite">
-
- <component name="DifferentInterfaceComponent">
- <implementation.composite name="assembly-tests:Assembly-different-reference-interface-inner-Composite"/>
- <reference name="c" target="CComponent"/>
- </component>
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- </component>
-
-
-</composite>
-
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
deleted file mode 100644
index a46d21c9a7..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-different-service-interface-inner-Composite">
-
- <service name="DifferentInterfaceService" promote="CComponent">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.BService">
- </interface.java>
- </service>
-
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- <service name="CService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
deleted file mode 100644
index a16b71cb68..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-different-service-interface-outer-Composite">
-
- <component name="DifferentInterfaceComponent">
-
- <implementation.composite name="assembly-tests:Assembly-different-service-interface-inner-Composite"/>
-
- </component>
-</composite>
-
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/dservicews.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/dservicews.composite
deleted file mode 100644
index 2e05a862ff..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/dservicews.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://helloworld"
- xmlns:hw="http://helloworld"
- name="Assembly-dservice-ws--Composite">
-
- <component name="DServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.DServiceImpl" />
- <service name="DService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DService" />
- <binding.ws uri="http://localhost:8085/DService"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/localcomponent.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/localcomponent.composite
deleted file mode 100644
index b41bf6b9b9..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/localcomponent.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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests"
- name="Assembly-LocalComponent--Composite"
- local="false">
-
- <component name="DServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.DServiceImpl"/>
- <service name="DService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DService" />
- <binding.ws uri="http://localhost:8085/DService"/>
- </service>
- </component>
-
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
- <property name="someProperty">some b component value</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
deleted file mode 100644
index 5436e6b22a..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_inner.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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-non-promote-inner-Composite">
-
- <service name="BService" promote="BComponent"/>
- <service name="CService" promote="CComponent"/>
- <service name="NoPromoteService" promote="NoPromoteComponent"/>
-
-
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
- <property name="someProperty">some b component value</property>
- </component>
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- <service name="CServiceImpl">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
deleted file mode 100644
index 642e558b9c..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
+++ /dev/null
@@ -1,31 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-non-promote-outer-Composite">
-
- <component name="TestNonPromoteComponent">
-
- <implementation.composite name="assembly-tests:Assembly-non-promote-inner-Composite"/>
-
- </component>
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
deleted file mode 100644
index 4166666536..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
+++ /dev/null
@@ -1,38 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-non-reference-promote-inner-Composite">
-
- <service name="AService" promote="AComponent"/>
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.assembly.composite.impl.AServiceImpl" />
- <reference name="b" />
- <reference name="c" />
- </component>
-
- <reference name="referenceB" promote="AComponent/b" />
- <reference name="referenceC" promote="AComponent/NonReference" />
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
deleted file mode 100644
index 61183d26cc..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
+++ /dev/null
@@ -1,44 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-non-reference-promote-outer-Composite">
-
- <component name="TestNonPromoteComponent">
-
- <implementation.composite name="assembly-tests:Assembly-non-reference-promote-inner-Composite"/>
- <reference name="referenceB" target="BComponent"/>
- <reference name="referenceC" target="CComponent"/>
- </component>
-
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
- <property name="someProperty">some b component value</property>
- </component>
-
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- </component>
-
-</composite>
-
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
deleted file mode 100644
index 5e68c0c675..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-non-service-promote-inner-Composite">
-
- <service name="BService" promote="BComponent"/>
- <service name="CService" promote="CComponent"/>
- <service name="NoPromoteService" promote="NoPromoteComponent"/>
-
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
- <property name="someProperty">some b component value</property>
- </component>
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- <service name="CService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
- </service>
- </component>
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
deleted file mode 100644
index 3dcaf9e2e7..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
+++ /dev/null
@@ -1,31 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-non-service-promote-outer-Composite">
-
- <component name="TestNonPromoteComponent">
-
- <implementation.composite name="assembly-tests:Assembly-non-service-promote-inner-Composite"/>
-
- </component>
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
deleted file mode 100644
index 938c499910..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
+++ /dev/null
@@ -1,34 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-non-unique-reference-inner--Composite">
-
- <service name="AService" promote="AComponent"/>
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.assembly.composite.impl.AServiceImpl" />
- <reference name="b" />
- <reference name="c" />
- </component>
-
- <reference name="NonUniqueReference" promote="AComponent/b" />
- <reference name="NonUniqueReference" promote="AComponent/c" />
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
deleted file mode 100644
index 5e4a513fc9..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests"
- xmlns:assembly-tests="http://assembly-tests"
- name="Assembly-non-unique-reference-outer--Composite">
-
- <component name="TestNonUniqueReferenceComponent">
- <implementation.composite name="assembly-tests:Assembly-non-unique-reference-inner--Composite"/>
- <reference name="NonUniqueReference" target="BComponent"/>
- <reference name="NonUniqueReference" target="CComponent"/>
- </component>
-
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
- <property name="someProperty">some b component value</property>
- </component>
-
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- </component>
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
deleted file mode 100644
index 53f61fbf8c..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-non-unique-service-inner-Composite">
-
- <service name="BCService" promote="CComponent"/>
- <service name="BCService" promote="BComponent"/>
-
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
- <property name="someProperty">some b component value</property>
- </component>
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- <service name="CService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
- </service>
- </component>
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
deleted file mode 100644
index 7babfcec1f..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
+++ /dev/null
@@ -1,31 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-non-promote-outer-Composite">
-
- <component name="TestNonUniqueServiceComponent">
-
- <implementation.composite name="assembly-tests:Assembly-non-unique-service-inner-Composite"/>
-
- </component>
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_inner.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_inner.composite
deleted file mode 100644
index 81dc49f96e..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_inner.composite
+++ /dev/null
@@ -1,34 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-reference-inner--Composite">
-
- <service name="AService" promote="AComponent"/>
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.assembly.composite.impl.AServiceImpl" />
- <reference name="b" />
- <reference name="c" />
- </component>
-
- <reference name="b" promote="AComponent/b" />
- <reference name="c" promote="AComponent/c" />
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_outer.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_outer.composite
deleted file mode 100644
index c215dc0a5c..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_outer.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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests"
- xmlns:assembly-tests="http://assembly-tests"
- name="Assembly-reference-outer--Composite">
-
- <component name="TestReferenceComponent">
- <implementation.composite name="assembly-tests:Assembly-reference-inner--Composite"/>
- <reference name="b" target="BComponent"/>
- <reference name="c" target="CComponent"/>
- </component>
-
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
- <property name="someProperty">some b component value</property>
- </component>
-
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- </component>
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_inner.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_inner.composite
deleted file mode 100644
index f2595c9798..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_inner.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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-service-inner-Composite">
-
- <service name="CService" promote="CComponent"/>
- <service name="BService" promote="BComponent"/>
-
-
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
- <property name="someProperty">some b component value</property>
- </component>
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- <service name="CService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
- </service>
- </component>
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_outer.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_outer.composite
deleted file mode 100644
index e8120025fa..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_outer.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests"
- xmlns:assembly-tests="http://assembly-tests"
- name="Assembly-reference-outer--Composite">
-
- <component name="TestServiceComponent">
-
- <implementation.composite name="assembly-tests:Assembly-service-inner-Composite"/>
-
- </component>
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subinterfacewire.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subinterfacewire.composite
deleted file mode 100644
index 9b3d773b73..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subinterfacewire.composite
+++ /dev/null
@@ -1,53 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests"
- name="Assembly-sub-interface-wire--Composite">
-
- <component name="FComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.FServiceImpl"/>
- <reference name="d">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DService" />
- </reference>
- <reference name="c">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService" />
- </reference>
- </component>
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CSubServiceImpl"/>
- <service name="CSubService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CSubService"/>
- </service>
- </component>
-
-
- <component name="DComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.DSubServiceImpl"/>
- <service name="DSubService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DSubService" />
- </service>
- </component>
-
- <wire source="FComponent/d" target="DComponent" />
- <wire source="FComponent/c" target="CComponent" />
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite
deleted file mode 100644
index 0c35b9348a..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-sub-reference-interface-inner-Composite">
-
- <service name="AService" promote="AComponent"/>
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.assembly.composite.impl.AServiceImpl" />
- <reference name="b"/>
- <reference name="c">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService" />
- </reference>
- </component>
-
- <reference name="c" promote="AComponent/c">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CSuperService" />
- </reference>
-
- <reference name="b" promote="AComponent/b"/>
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite
deleted file mode 100644
index 62e712f533..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-sub-reference-interface-outer-Composite">
-
- <component name="SubReferenceInterfaceComponent">
- <implementation.composite name="assembly-tests:Assembly-sub-reference-interface-inner-Composite"/>
- <reference name="c" target="CComponent"/>
- <reference name="b" target="BComponent"/>
- </component>
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CSuperServiceImpl"/>
- </component>
-
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
- <property name="someProperty">some b component value</property>
- </component>
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite
deleted file mode 100644
index ac63024161..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-sub-service-interface-inner-Composite">
-
- <service name="SubInterfaceService" promote="CComponent">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CSubService">
- </interface.java>
- </service>
-
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- <service name="CService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
- </service>
- </component>
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite
deleted file mode 100644
index df2c01429e..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite
+++ /dev/null
@@ -1,31 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:assembly-tests="http://assembly-tests"
- targetNamespace="http://assembly-tests"
- name="Assembly-sub-service-interface-outer-Composite">
-
- <component name="SubInterfaceComponent">
-
- <implementation.composite name="assembly-tests:Assembly-sub-service-interface-inner-Composite"/>
-
- </component>
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/wire.composite b/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/wire.composite
deleted file mode 100644
index 7eac450d23..0000000000
--- a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/wire.composite
+++ /dev/null
@@ -1,53 +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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests"
- name="Assembly-wire--Composite">
-
- <component name="FComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.FServiceImpl"/>
- <reference name="d">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DService" />
- </reference>
- <reference name="c">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService" />
- </reference>
- </component>
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CSuperServiceImpl"/>
- <service name="CSuperService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CSuperService"/>
- </service>
- </component>
-
-
- <component name="DComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.DSuperServiceImpl"/>
- <service name="DSuperService">
- <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DSuperService" />
- </service>
- </component>
-
- <wire source="FComponent/d" target="DComponent" />
- <wire source="FComponent/c" target="CComponent" />
-
-</composite> \ No newline at end of file