summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5/itest/recursive-ws/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/Target.java26
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java33
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java29
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/Composer.java26
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClient.java35
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java38
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java34
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerServer.java35
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Client.composite28
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Inner.composite26
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Outer.composite31
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite36
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite40
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite37
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite41
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/definitions.xml39
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java57
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java74
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java68
-rw-r--r--branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java55
20 files changed, 0 insertions, 788 deletions
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/Target.java b/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/Target.java
deleted file mode 100644
index c77fcea868..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/Target.java
+++ /dev/null
@@ -1,26 +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 policy;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Target {
- String hello(String arg);
-}
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
deleted file mode 100644
index 87e412829e..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetClientImpl.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 policy;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetClientImpl implements Target {
-
- @Reference
- protected Target targetService;
-
- public String hello(String arg) {
- return "Target: Hello " + targetService.hello(arg) + "!";
- }
-}
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
deleted file mode 100644
index e565055252..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package policy;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetServiceImpl implements Target {
-
- public String hello(String arg) {
- return "Target: Hello " + arg + "!";
- }
-}
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/Composer.java b/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/Composer.java
deleted file mode 100644
index e53f99d9c3..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/Composer.java
+++ /dev/null
@@ -1,26 +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 recursive;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Composer {
- public String Compose(String s);
-} \ No newline at end of file
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
deleted file mode 100644
index 7956d153cb..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
+++ /dev/null
@@ -1,35 +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 recursive;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * For testing purpose
- */
-public class ComposerClient {
-
- public final static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("Client.composite");
- Composer composer = scaDomain.getService(Composer.class, "ClientComponent/Composer");
- System.out.println(composer.Compose("ABC"));
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
deleted file mode 100644
index 3d75b7b165..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package recursive;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComposerClientImpl implements Composer {
- @Reference
- protected Composer composerWS;
-
- /**
- * @see recursive.Composer#Compose(java.lang.String)
- */
- public String Compose(String s) {
- return composerWS.Compose(s);
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
deleted file mode 100644
index 8b77484922..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package recursive;
-
-/**
- * Composer Component Implementation
- *
- */
-
-public class ComposerImpl implements Composer {
-
- public String Compose(String s) {
- System.out.println("Composing " + s + "...");
- return "Composed: " + s;
-
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
deleted file mode 100644
index 5035d1cbd9..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
+++ /dev/null
@@ -1,35 +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 recursive;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * For testing purpose
- */
-public class ComposerServer {
-
- public final static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("Outer.composite");
- System.out.println("Press Enter to exit...");
- System.in.read();
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Client.composite b/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Client.composite
deleted file mode 100644
index 56d7c01377..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Client.composite
+++ /dev/null
@@ -1,28 +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://client" name="Client">
- <component name="ClientComponent">
- <implementation.java class="recursive.ComposerClientImpl" />
- <reference name="composerWS">
- <binding.ws uri="http://localhost:8085/OuterService"/>
- </reference>
- </component>
-</composite>
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Inner.composite b/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Inner.composite
deleted file mode 100644
index b054ae0944..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Inner.composite
+++ /dev/null
@@ -1,26 +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://inner" name="Inner">
- <component name="InnerComponent">
- <implementation.java class="recursive.ComposerImpl" />
- </component>
- <service name="OuterService" promote="InnerComponent"/>
-</composite>
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Outer.composite b/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Outer.composite
deleted file mode 100644
index 3c3f327b28..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/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" targetNamespace="http://outer" xmlns:inner="http://inner"
- name="Outer">
- <component name="OuterComponent">
- <implementation.composite name="inner:Inner" />
- <service name="OuterService">
- <interface.java interface="recursive.Composer" />
- <binding.ws uri="http://localhost:8085/OuterService" />
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
deleted file mode 100644
index b5c180919c..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
+++ /dev/null
@@ -1,36 +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://bindingoverride"
- xmlns:bindingoverride="http://bindingoverride"
- name="BindingOverrideInnerComposite">
-
- <service name="InnerService" promote="InnerServiceComponent">
- <interface.java interface="policy.Target"/>
- </service>
-
- <component name="InnerServiceComponent">
- <implementation.java class="policy.TargetServiceImpl"/>
- <service name="Target">
- <interface.java interface="policy.Target"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
deleted file mode 100644
index 891cac0b79..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
+++ /dev/null
@@ -1,40 +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://bindingoverride"
- xmlns:bindingoverride="http://bindingoverride"
- name="BindingOverrideOuterComposite">
-
- <component name="OuterClientComponent">
- <implementation.java class="policy.TargetClientImpl"/>
- <reference name="targetService" target="OuterServiceComponent">
- <binding.ws/>
- </reference>
- </component>
-
- <component name="OuterServiceComponent">
- <implementation.composite name="bindingoverride:BindingOverrideInnerComposite"/>
- <service name="InnerService">
- <interface.java interface="policy.Target"/>
- <binding.ws uri="http://localhost:8085/OuterTargetServiceComponent"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
deleted file mode 100644
index 4b398743eb..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.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"
- targetNamespace="http://policy"
- xmlns:policy="http://policy"
- name="PolicyInnerComposite">
-
- <service name="TargetService" promote="TargetServiceComponent">
- <interface.java interface="policy.Target"/>
- </service>
-
- <component name="TargetServiceComponent">
- <implementation.java class="policy.TargetServiceImpl"/>
- <service name="Target">
- <interface.java interface="policy.Target"/>
- <binding.ws uri="http://localhost:8085/TargetServiceComponent"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
deleted file mode 100644
index b50bc29a1f..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://policy"
- xmlns:policy="http://policy"
- name="PolicyOuterComposite"
- requires="policy:TestIntent_1">
-
- <component name="TargetClientComponent">
- <implementation.java class="policy.TargetClientImpl"/>
- <reference name="targetService" target="OuterTargetServiceComponent">
- <binding.ws/>
- </reference>
- </component>
-
- <component name="OuterTargetServiceComponent">
- <implementation.composite name="policy:PolicyInnerComposite"/>
- <service name="TargetService">
- <interface.java interface="policy.Target"/>
- <binding.ws uri="http://localhost:8085/OuterTargetServiceComponent"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/definitions.xml b/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/definitions.xml
deleted file mode 100644
index 3ae202f4aa..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/definitions.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://policy"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:ip="http://policy" >
-
- <!-- Policy Intents -->
- <sca:intent name="TestIntent_1" constrains="sca:binding.ws">
- <description>Test Intent One</description>
- </sca:intent>
-
- <!-- Policy Sets -->
- <sca:policySet name="TestPolicySet_1_binding"
- provides="ip:TestIntent_1"
- appliesTo="sca:binding.ws"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <wsp:Policy />
- </sca:policySet>
-
-</definitions> \ No newline at end of file
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/branches/sca-java-1.5/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
deleted file mode 100644
index c6e46564f0..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
+++ /dev/null
@@ -1,57 +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 bindingoverride;
-
-import junit.framework.Assert;
-
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import policy.Target;
-
-public class BindingOverrideTestCase{
-
- private SCADomain domain;
- private Target targetClient;
-
- @Before
- public void setUp() throws Exception {
- try {
- domain = SCADomain.newInstance("bindingoverride/OuterComposite.composite");
- targetClient = domain.getService(Target.class, "OuterClientComponent");
- } catch(Exception ex) {
- System.out.println(ex.toString());
- }
- }
-
- @After
- public void tearDown() throws Exception {
- domain.close();
- }
-
- @Test
- //@Ignore("TUSCANY-2352")
- public void test() throws Exception {
- Assert.assertEquals("Target: Hello Target: Hello Fred!!", targetClient.hello("Fred"));
- }
-}
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/branches/sca-java-1.5/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
deleted file mode 100644
index 3e71246da2..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
+++ /dev/null
@@ -1,74 +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 policy;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.impl.CompositeImpl;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.osoa.sca.annotations.EndsConversation;
-
-public class PolicyTestCase{
-
- private SCADomain domain;
- private Target targetClient;
-
- @Before
- public void setUp() throws Exception {
- try {
- domain = SCADomain.newInstance("policy/PolicyOuterComposite.composite");
- targetClient = domain.getService(Target.class, "TargetClientComponent");
- } catch(Exception ex) {
- System.out.println(ex.toString());
- }
- }
-
- @After
- public void tearDown() throws Exception {
- domain.close();
- }
-
- @Test
- public void test() throws Exception {
- //Check that the binding policy sets do flow down to the component but not down to the
- //component inside implementation.composite
- Component outerComponent = ((DefaultSCADomain)domain).getComponent("OuterTargetServiceComponent");
-
- // The outer component service bindings should have policy sets attached
- Assert.assertEquals(1, ((PolicySetAttachPoint)outerComponent.getServices().get(0).getBindings().get(0)).getPolicySets().size());
-
- Component component =((CompositeImpl)outerComponent.getImplementation()).getComponents().get(0);
-
- // The original inner component service binding should not have policy sets attached
- Assert.assertEquals(0, ((PolicySetAttachPoint)component.getServices().get(0).getBindings().get(0)).getPolicySets().size());
-
- // The promoted inner component service binding should have policy sets attached
- Assert.assertEquals(1, ((PolicySetAttachPoint)component.getServices().get(1).getBindings().get(0)).getPolicySets().size());
-
- String result = targetClient.hello("Fred");
-
- System.out.println(result);
- }
-}
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
deleted file mode 100644
index 6638d65551..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
+++ /dev/null
@@ -1,68 +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 recursive;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import recursive.Composer;
-
-/**
- * Test case for helloworld web service client
- */
-public class ComposerClientTestCase {
-
- private Composer composer;
- private SCADomain scaDomain;
-
- private SCATestCaseRunner server;
-
- @Before
- public void startClient() throws Exception {
- try {
- scaDomain = SCADomain.newInstance("Client.composite");
- composer = scaDomain.getService(Composer.class, "ClientComponent/Composer");
-
- server = new SCATestCaseRunner(ComposerTestServer.class);
- server.before();
-
- } catch (Throwable e) {
- e.printStackTrace();
- }
- }
-
- @Test
- public void testWSClient() throws Exception {
- String msg = composer.Compose("ABC");
- Assert.assertEquals("Composed: ABC", msg);
- }
-
- @After
- public void stopClient() throws Exception {
- server.after();
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
deleted file mode 100644
index 214379bcea..0000000000
--- a/branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package recursive;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Starts up the SCA runtime which starts listening for service requests
- */
-public class ComposerTestServer {
-
- private SCADomain scaDomain;
-
- @Before
- public void startServer() throws Exception {
- try {
- scaDomain = SCADomain.newInstance("Outer.composite");
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Test
- public void testPing() throws IOException {
- new Socket("127.0.0.1", 8085);
- }
-
- @After
- public void stopServer() throws Exception {
- scaDomain.close();
- }
-
-}