Remove old beta1 branch

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

11 files changed, 0 insertions, 617 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
deleted file mode 100644
index e697cedd62..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/ConstructorPropertyInjection.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://foo" name="ConstructorPropertyInjection">
-
-    <component name="Foo1Component">
-        <implementation.java class="org.apache.tuscany.sca.itest.cdi.Foo1" />
-        <property name="bar" value="foobar" />
-    </component>
-
-    <component name="Foo2Component">
-        <implementation.java class="org.apache.tuscany.sca.itest.cdi.Foo2" />
-        <property name="bar">fubar</property>
-    </component>
-
-    <component name="Foo3Component">
-        <implementation.java class="org.apache.tuscany.sca.itest.cdi.Foo3" />
-        <property name="bar">
-            <value>fubar</value>
-        </property>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/Outer.composite b/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/Outer.composite
deleted file mode 100644
index 93f164a1e7..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/Outer.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
- * 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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-    xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912" name="Iteration3Composite"
-    targetNamespace="http://foo" local="true" autowire="false">
-
-    <property name="newLocation" type="xsd:anyURI">Raleigh</property>
-    <property name="newYear" type="xsd:anyURI">2008</property>
-    <component name="MyServiceComponent">
-        <implementation.java class="mysca.test.myservice.impl.MyServiceImpl" />
-    </component>
-    <component name="MyServiceComponentNew">
-        <implementation.java class="mysca.test.myservice.impl.MyServiceImpl" />
-        <property name="location" source="$newLocation" />
-        <property name="year" source="$newYear" />
-    </component>
-    <component name="MyTotalServiceNewComponent">
-        <implementation.java class="mysca.test.myservice.impl.MyTotalServiceImpl" />
-        <reference name="myService" target="MyServiceComponentNew/MyService" />
-    </component>
-    <component name="MySimpleServiceInRecursiveAnother">
-        <implementation.composite name="foo:MySimpleService" />
-        <property name="newLocation">Durham</property>
-        <property name="newYear">2009</property>
-    </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/OuterPropertyTest.composite
deleted file mode 100644
index 0c8714cbe1..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/OuterPropertyTest.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

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

-           xmlns:foo="http://foo" 

-           targetNamespace="http://foo"

-           name="OuterPropertyTest" 

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-

-    <component name="OuterComponent">

-        <implementation.composite name="foo:PropertyTest" />

-        <property name="number">125</property>

-        <property name="complex" type="foo:MyComplexType">

-            <value>

-                <foo:a>Overriden A</foo:a>

-                <foo:b>Overriden B</foo:b>

-                <foo:c>Overriden C</foo:c>

-                <foo:d>Overriden D</foo:d>

-                <foo:x>

-                    <foo:y>Overriden Y</foo:y>

-                    <foo:z>Overriden Z</foo:z>

-                </foo:x>

-            </value>

-        </property>

-    </component>

-</composite>

-

diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/PropertyTest.composite
deleted file mode 100644
index 7c834d5e0b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/PropertyTest.composite
+++ /dev/null
@@ -1,260 +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
- * 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" 
-       xmlns:foo="http://foo" 
-       xmlns:cust="http://www.example.com/Customer"
-       xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-       xmlns:rcp="http://test.sca.jaxb/rcprops"
-       targetNamespace="http://foo"
-       name="PropertyTest"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-           
-    <service name="ProperterTestService" promote="ABComponent">
-        <interface.java interface="org.apache.tuscany.sca.itest.ABComponent"/>
-    </service>           
-               
-    <property name="number" type="xsd:int">1</property>
-    <property name="complex" type="foo:MyComplexType" >
-        <value>
-            <foo:a>a</foo:a>
-            <foo:b>b</foo:b>
-            <foo:c>c</foo:c>
-            <foo:d>d</foo:d>
-            <foo:x>
-                <foo:y>y</foo:y>
-                <foo:z>z</foo:z>
-            </foo:x>
-        </value>
-    </property>
-
-    <property name="moreComplex" type="foo:MyMoreComplexType">
-        <value>
-            <numberSetArray>
-                <integerNumber>1</integerNumber>
-                <floatNumber>11</floatNumber>
-                <doubleNumber>111</doubleNumber>
-            </numberSetArray>
-            <numberSetArray>
-                <integerNumber>2</integerNumber>
-                <floatNumber>22</floatNumber>
-                <doubleNumber>222</doubleNumber>
-            </numberSetArray>
-            <stringArray>TestString_1</stringArray>
-            <stringArray>TestString_2</stringArray>
-            <intArray>10</intArray>
-            <intArray>20</intArray>
-            <integerNumber>27</integerNumber>
-            <floatNumber>79.34</floatNumber>
-            <doubleNumber>184.52</doubleNumber>
-            <doubleArray>50.05</doubleArray>
-            <doubleArray>25.52</doubleArray>
-            <numberSet>
-                <integerNumber>54</integerNumber>
-                <floatNumber>158.68</floatNumber>
-                <doubleNumber>369.04</doubleNumber>
-            </numberSet>
-        </value>
-    </property>
-    
-    <property name="complexFoo" type="foo:MyMoreComplexType">
-        <value>
-            <stringArray>TestString_3</stringArray>
-            <stringArray>TestString_4</stringArray>
-            <intArray>100</intArray>
-            <intArray>200</intArray>
-        </value>
-    </property>
-
-    <component name="ABCDComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.ABCDComponentImpl"/>
-        <reference name="ab" target="ABComponent"/>
-        <reference name="cd" target="CDComponent"/>
-    </component>
-
-    <component name="ABComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.ABComponentImpl"/>
-        <property name="a" source="$complex/foo:a"/>
-        <property name="b" source="$complex/foo:b"/>
-        <property name="f" source="$complex/foo:a">f</property>
-        <property name="xpath" source="$complex/foo:x/*[local-name()='z']"/>
-        <property name="one" source="$number"/>
-        <property name="foobar" many="true">
-            <value>Apache</value>
-            <value>Tuscany</value>
-            <value>Java SCA</value>
-        </property>
-        <property name="fooInts" many="true">
-            <value>123</value> 
-            <value>456</value> 
-            <value>789</value>
-        </property>
-    </component>
-    
-
-    <component name="CDComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.CDComponentImpl"/>
-        <property name="c" source="$complex/foo:c"/>
-        <property name="d" source="$complex/foo:d"/>
-        <property name="nosource">aValue</property>
-        <property name="fileProperty" file="fileProperty.txt"/>
-        <property name="manyValuesFileProperty" many="true" file="manyValuesFileProperty.txt"/>
-        <property name="nonFileProperty"  file="fileProperty.txt" source="$complex/foo:c"/>
-        <property name="two" source="$number">25</property>
-    </component>
-
-    <component name="PropertyComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.PropertyComponentImpl"/>
-        <property name="complexPropertyOne" source="$moreComplex"></property>
-        <property name="complexPropertyTwo" type="foo:MyMoreComplexType">
-            <value>
-                <stringArray>TestString_1</stringArray>
-                <stringArray>TestString_2</stringArray>
-                <intArray>10</intArray>
-                <integerNumber>27</integerNumber>
-                <floatNumber>79.34</floatNumber>
-                <doubleArray>25.52</doubleArray>
-                <doubleNumber>184.52</doubleNumber>
-                <doubleArray>50.05</doubleArray>
-                <intArray>20</intArray>
-                <numberSetArray>
-                    <integerNumber>1</integerNumber>
-                    <floatNumber>11</floatNumber>
-                    <doubleNumber>111</doubleNumber>
-                </numberSetArray>
-                <numberSetArray>
-                    <integerNumber>2</integerNumber>
-                    <floatNumber>22</floatNumber>
-                    <doubleNumber>222</doubleNumber>
-                </numberSetArray>
-                <numberSet>
-                    <integerNumber>54</integerNumber>
-                    <floatNumber>158.68</floatNumber>
-                    <doubleNumber>369.04</doubleNumber>
-                </numberSet>
-            </value>
-        </property>
-        <property name="complexPropertyThree" element="foo:PropertyThreeElement">
-            <PropertyThreeElement xmlns="http://foo">
-                <stringArray>TestElementString_1</stringArray>
-                <stringArray>TestElementString_2</stringArray>
-                <intArray>10</intArray>
-                <integerNumber>27</integerNumber>
-                <floatNumber>79.34</floatNumber>
-                <doubleArray>25.52</doubleArray>
-                <doubleNumber>184.52</doubleNumber>
-                <doubleArray>50.05</doubleArray>
-                <intArray>20</intArray>
-                <numberSetArray>
-                    <integerNumber>1</integerNumber>
-                    <floatNumber>11</floatNumber>
-                    <doubleNumber>111</doubleNumber>
-                </numberSetArray>
-                <numberSetArray>
-                    <integerNumber>2</integerNumber>
-                    <floatNumber>22</floatNumber>
-                    <doubleNumber>222</doubleNumber>
-                </numberSetArray>
-                <numberSet>
-                    <integerNumber>54</integerNumber>
-                    <floatNumber>158.68</floatNumber>
-                    <doubleNumber>369.04</doubleNumber>
-                </numberSet>
-            </PropertyThreeElement>
-        </property>
-        <property name="complexPropertyFour" element="foo:PropertyFourElement" many="true">
-            <PropertyFourElement xmlns="http://foo">
-                <integerNumber>1</integerNumber>
-                <floatNumber>11.11</floatNumber>
-                <doubleNumber>111.111</doubleNumber>
-                <numberSet>
-                    <integerNumber>11</integerNumber>
-                    <floatNumber>1111.1111</floatNumber>
-                    <doubleNumber>11111.11111</doubleNumber>
-                </numberSet>
-            </PropertyFourElement>
-            <PropertyFourElement xmlns="http://foo">
-                <integerNumber>2</integerNumber>
-                <floatNumber>22.22</floatNumber>
-                <doubleNumber>222.222</doubleNumber>
-                <numberSet>
-                    <integerNumber>22</integerNumber>
-                    <floatNumber>2222.2222</floatNumber>
-                    <doubleNumber>22222.22222</doubleNumber>
-                </numberSet>
-            </PropertyFourElement>
-            <PropertyFourElement xmlns="http://foo">
-                <integerNumber>3</integerNumber>
-                <floatNumber>33.33</floatNumber>
-                <doubleNumber>333.333</doubleNumber>
-                <numberSet>
-                    <integerNumber>33</integerNumber>
-                    <floatNumber>3333.3333</floatNumber>
-                    <doubleNumber>33333.33333</doubleNumber>
-                </numberSet>
-            </PropertyFourElement>
-        </property>
-        <property name="complexPropertyFive" source="$complexFoo"/>
-        <property name="location" type="xsd:string">RTP</property>	
-        <property name="year" type="xsd:string">2006</property>	
-        <property name="daysOfTheWeek" many="true" type="xsd:string">
-            <value>Monday</value>
-            <value>Tuesday</value> 
-            <value>Wednesday</value> 
-            <value>Thursday</value> 
-            <value>Friday</value> 
-            <value>Saturday</value> 
-            <value>Sunday</value>
-        </property>
-        <property name="integerNumbers" many="true" type="xsd:int">
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
-            <value>4</value>
-            <value>5</value>
-            <value>6</value>
-            <value>7</value>
-            <value>8</value>
-            <value>9</value>
-            <value>10</value>
-        </property>
-        <property name="intNumbers" many="true" type="xsd:int">
-            <value>10</value>
-            <value>9</value>
-            <value>8</value>
-            <value>7</value>
-            <value>6</value>
-            <value>5</value>
-            <value>4</value>
-            <value>3</value>
-            <value>2</value>
-            <value>1</value>
-            <value>0</value>
-        </property>
-
-        <property name="complexJAXBPropertyOne" type="rcp:ReturnCodeProperties">
-            <MyRCProps xmlns="http://test.sca.jaxb/rcprops">
-                <AInt>10</AInt>
-                <BInteger>10</BInteger>
-            </MyRCProps>
-        </property>
-        <property name="complexJAXBPropertyTwo" type="rcp:ReturnCodeProperties" file="rcProps.txt"/>
-    </component>
-</composite>
-
-
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/customer.xsd b/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/customer.xsd
deleted file mode 100644
index 7421750f1b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/customer.xsd
+++ /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.    
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns="http://www.example.com/Customer" targetNamespace="http://www.example.com/Customer">
-
-    <xsd:element name="customer" type="Customer"/>
-    <xsd:complexType name="Customer">
-        <xsd:sequence>
-            <xsd:element name="firstName"  type="xsd:string"/>
-            <xsd:element name="middleName" type="xsd:string"/>
-            <xsd:element name="lastName"   type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
- </xsd:schema>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/fileProperty.txt b/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/fileProperty.txt
deleted file mode 100644
index 7e932622ce..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/fileProperty.txt
+++ /dev/null
@@ -1,21 +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.
--->
-
-<filePropertyTest>fileValue</filePropertyTest>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/foo.xsd b/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/foo.xsd
deleted file mode 100644
index 6831f66cec..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/foo.xsd
+++ /dev/null
@@ -1,40 +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.    

--->

-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-            xmlns="http://foo" 

-            targetNamespace="http://foo"

-            elementFormDefault="qualified">

-

-    <xsd:complexType name="MyComplexType">

-        <xsd:sequence>

-            <xsd:element name="a"  type="xsd:string"/>

-            <xsd:element name="b"  type="xsd:string"/>

-            <xsd:element name="c"  type="xsd:string"/>

-            <xsd:element name="d"  type="xsd:string"/>

-            <xsd:element name="x">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="y"  type="xsd:string"/>

-                        <xsd:element name="z"  type="xsd:string"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-        </xsd:sequence>

-    </xsd:complexType>

- </xsd:schema>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/manyValuesFileProperty.txt
deleted file mode 100644
index e037537d7d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ /dev/null
@@ -1,25 +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.

--->

-<value>

-    <manyFilePropertyValues>fileValueOne</manyFilePropertyValues>

-    <manyFilePropertyValues>fileValueTwo</manyFilePropertyValues>

-    <manyFilePropertyValues>fileValueThree</manyFilePropertyValues>

-    <manyFilePropertyValues>fileValueFour</manyFilePropertyValues>

-</value>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/mySimpleService.composite b/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/mySimpleService.composite
deleted file mode 100644
index 347990cca8..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/mySimpleService.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 autowire="false" local="true" name="MySimpleService"
-    targetNamespace="http://foo" xmlns:foo="http://foo" xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912 ">
-
-
-    <service name="MyServiceNew1" promote="MyServiceComponentNew/MyService">
-        <interface.java interface="mysca.test.myservice.impl.MyService" />
-    </service>
-
-    <property name="newLocation" type="xsd:anyURI">Raleigh</property>
-    <property name="newYear" type="xsd:anyURI">2008</property>
-
-
-    <component name="MyServiceComponentNew">
-        <implementation.java class="mysca.test.myservice.impl.MyServiceImpl" />
-        <property name="location" source="$newLocation" />
-        <property name="year" source="$newYear" />
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/rcProps.txt b/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/rcProps.txt
deleted file mode 100644
index 052c291fd0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/rcProps.txt
+++ /dev/null
@@ -1,22 +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
- * 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.
--->
-<MyRCProps xmlns="http://test.sca.jaxb/rcprops">
-    <AInt>20</AInt>
-    <BInteger>20</BInteger>
-</MyRCProps>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/rcprops.xsd b/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/rcprops.xsd
deleted file mode 100644
index 21289fa7b2..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/properties/src/main/resources/rcprops.xsd
+++ /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
- * 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.
--->
-<schema elementFormDefault="qualified" targetNamespace="http://test.sca.jaxb/rcprops"
-    xmlns:tns="http://test.sca.jaxb/rcprops" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0"
-    xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-
-    <!-- Use some JAXB customizations -->
-
-    <annotation>
-        <appinfo>
-            <jaxb:schemaBindings>
-                <jaxb:package name="test.jaxb.props" />
-            </jaxb:schemaBindings>
-        </appinfo>
-    </annotation>
-
-    <element name="MyRCProps" type="tns:ReturnCodeProperties" />
-
-    <complexType name="ReturnCodeProperties">
-        <sequence>
-            <element name="AInt" type="xsd:int">
-                <annotation>
-                    <appinfo>
-                        <jaxb:property name="a" />
-                    </appinfo>
-                </annotation>
-            </element>
-            <element name="BInteger" type="xsd:integer">
-                <annotation>
-                    <appinfo>
-                        <jaxb:property name="b" />
-                    </appinfo>
-                </annotation>
-            </element>
-        </sequence>
-    </complexType>
-</schema>
-
-