Delete and redo release branch

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

16 files changed, 0 insertions, 548 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/policy/Target.java b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/policy/Target.java
deleted file mode 100644
index 2366f6542a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/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.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Target {
-    String hello(String arg);
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
deleted file mode 100644
index b2d59e925c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/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.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.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/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
deleted file mode 100644
index 6f52dfb26e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/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.oasisopen.sca.annotation.Service;
-
-@Service(Target.class)
-public class TargetServiceImpl implements Target {
-
-    public String hello(String arg) {
-        return "Target: Hello " + arg + "!";
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/recursive/Composer.java b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/recursive/Composer.java
deleted file mode 100644
index 18486115ae..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/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.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Composer {
-    public String Compose(String s);
-}
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
deleted file mode 100644
index 13c306d9b1..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/recursive/ComposerClient.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 recursive;
-
-import java.io.File;
-
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.Contribution;
-
-/**
- *  For testing purpose
- */
-public class ComposerClient {
-
-    public final static void main(String[] args) throws Exception {
-    	NodeFactory factory = NodeFactory.newInstance();
-        Node node = factory.createNode(new File("src/main/resources/Client.composite").toURI().toURL().toString(),
-                new Contribution("TestContribution", new File("src/main/resources/").toURI().toURL().toString()));
-        node.start();
-        Composer composer = ((Client)node).getService(Composer.class, "ClientComponent/Composer");
-        System.out.println(composer.Compose("ABC"));
-        node.stop();
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
deleted file mode 100644
index 3c432bc26a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/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.oasisopen.sca.annotation.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/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
deleted file mode 100644
index 8b77484922..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/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/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
deleted file mode 100644
index a123160d85..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package recursive;
-
-import java.io.File;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.Contribution;
-
-/**
- *  For testing purpose
- */
-public class ComposerServer {
-
-    public final static void main(String[] args) throws Exception {
-    	NodeFactory factory = NodeFactory.newInstance();
-        Node node = factory.createNode(new File("src/main/resources/Outer.composite").toURI().toURL().toString(),
-                new Contribution("TestContribution", new File("src/main/resources/").toURI().toURL().toString()));
-        node.start();
-        System.out.println("Press Enter to exit...");
-        System.in.read();
-        node.stop();
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/Client.composite b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/Client.composite
deleted file mode 100644
index 50cbaa5086..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/Client.composite
+++ /dev/null
@@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           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/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/Inner.composite b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/Inner.composite
deleted file mode 100644
index df7130ba99..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/Inner.composite
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           targetNamespace="http://inner" name="Inner">

-    <component name="InnerComponent">

-        <implementation.java class="recursive.ComposerImpl" />

-    </component>

-    <service name="OuterService" promote="InnerComponent"/>

-</composite>

diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/Outer.composite b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/Outer.composite
deleted file mode 100644
index 1c7d49f1c0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-    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/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
deleted file mode 100644
index cb6e0cc358..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/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://docs.oasis-open.org/ns/opencsa/sca/200912"

-    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/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
deleted file mode 100644
index 3f76efb11b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.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://docs.oasis-open.org/ns/opencsa/sca/200912"

-    targetNamespace="http://bindingoverride"

-    xmlns:bindingoverride="http://bindingoverride"

-    name="BindingOverrideOuterComposite">

-    

-    <component name="OuterClientComponent">

-        <implementation.java class="policy.TargetClientImpl"/>

-        <reference name="targetService" target="OuterServiceComponent"/>

-    </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/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
deleted file mode 100644
index 3e78eb4533..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/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://docs.oasis-open.org/ns/opencsa/sca/200912"

-    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/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
deleted file mode 100644
index 6e686a579f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.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://docs.oasis-open.org/ns/opencsa/sca/200912"

-    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"/>

-    </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/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/policy/definitions.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/recursive-ws/src/main/resources/policy/definitions.xml
deleted file mode 100644
index 923e1ad5f6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/testing/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://docs.oasis-open.org/ns/opencsa/sca/200912" 
-             targetNamespace="http://policy"
-             xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-             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