summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.0/itest/properties/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.0/itest/properties/src/main')
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java26
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java73
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java39
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java27
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java55
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java35
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java98
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java33
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java97
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java89
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java25
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java24
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java36
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java99
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java24
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/resources/Outer.composite43
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/resources/OuterPropertyTest.composite42
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/resources/PropertyTest.composite214
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/resources/customer.xsd30
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/resources/fileProperty.txt21
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/resources/manyValuesFileProperty.txt23
-rw-r--r--branches/sca-java-1.0/itest/properties/src/main/resources/mySimpleService.composite40
22 files changed, 0 insertions, 1193 deletions
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/branches/sca-java-1.0/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
deleted file mode 100644
index 1f2fd0e5bd..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.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 mysca.test.myservice.impl;
-
-
-public interface MyService {
- String getLocation();
-
- String getYear();
-}
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/branches/sca-java-1.0/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
deleted file mode 100644
index 158f4a0c12..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package mysca.test.myservice.impl;
-
-import java.util.logging.Logger;
-
-import org.osoa.sca.annotations.ComponentName;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-@Service(MyService.class)
-public class MyServiceImpl implements MyService {
-
- @Property(name = "location")
- protected String location = "RTP";
-
- @Property(name = "year")
- protected String year = "2006";
-
- @ComponentName
- protected String componentName;
-
-
- private Logger logger;
-
- public MyServiceImpl() {
- logger = Logger.getAnonymousLogger();
- logger.info("creating service instance...");
- }
-
- @Init
- public void start() {
- logger.info("Start service..");
- }
-
- @Destroy
- public void stop() {
- logger.info("Stop service..");
-
- }
-
- public String getComponentName() {
- return componentName;
- }
-
- public String getLocation() {
- return location;
- }
-
- public String getYear() {
- return year;
- }
-
-}
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/branches/sca-java-1.0/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
deleted file mode 100644
index 9328c9149d..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
+++ /dev/null
@@ -1,39 +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 mysca.test.myservice.impl;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(MyService.class)
-public class MyTotalServiceImpl implements MyService {
-
- // default required==true so it is 1:1
- @Reference
- public MyService myService;
-
- public String getLocation() {
- return myService.getLocation();
- }
-
- public String getYear() {
- return myService.getYear();
- }
-
-}
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
deleted file mode 100644
index 667b854c10..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.itest;
-
-public interface ABCDComponent {
- String getA();
- String getB();
- String getC();
- String getD();
-}
-
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
deleted file mode 100644
index 51d4d9b3cb..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.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 org.apache.tuscany.sca.itest;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class ABCDComponentImpl implements ABCDComponent {
- private ABComponent abComponent;
- private CDComponent cdComponent;
-
- @Reference
- public void setAb(ABComponent component) {
- this.abComponent = component;
- }
-
- @Reference
- public void setCd(CDComponent component) {
- this.cdComponent = component;
- }
-
- public String getA() {
- return this.abComponent.getA();
- }
-
- public String getB() {
- return this.abComponent.getB();
- }
-
- public String getC() {
- return this.cdComponent.getC();
- }
-
- public String getD() {
- return this.cdComponent.getD();
- }
-}
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
deleted file mode 100644
index c33c140aec..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.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 org.apache.tuscany.sca.itest;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Remotable;
-@Remotable
-public interface ABComponent {
-
- String getA();
- String getB();
- String getZ();
- int getIntValue();
- String getF();
- Collection<String> getManyStringValues();
- Collection<Integer> getManyIntegers();
-}
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
deleted file mode 100644
index b78d6380ef..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Property;
-
-public class ABComponentImpl implements ABComponent {
-
- private String aProperty;
- private String bProperty;
- private int intValue;
- private Collection<String> manyStringValues;
- private Collection<Integer> manyIntegerValues;
- private String zProperty;
- private String fProperty;
-
- @Property(name="xpath")
- public void setZProperty(final String value) {
- this.zProperty = value;
- }
-
- @Property(name="foobar")
- public void setManyStringValues(final Collection<String> value) {
- this.manyStringValues = value;
- }
-
- @Property(name="fooInts")
- public void setManyIntegers(final Collection<Integer> value) {
- this.manyIntegerValues = value;
- }
-
- @Property
- public void setA(final String A) {
- this.aProperty = A;
- }
-
- @Property
- public void setB(final String B) {
- this.bProperty = B;
- }
-
- @Property
- public void setF(final String F) {
- this.fProperty = F;
- }
-
- @Property
- public void setOne(final int value) {
- this.intValue = value;
- }
-
- public String getA() {
- return this.aProperty;
- }
-
- public String getB() {
- return this.bProperty;
- }
-
- public int getIntValue() {
- return this.intValue;
- }
-
- public String getZ() {
- return this.zProperty;
- }
-
- public String getF() {
- return this.fProperty;
- }
-
- public Collection<String> getManyStringValues() {
- return manyStringValues;
- }
-
- public Collection<Integer> getManyIntegers() {
- return manyIntegerValues;
- }
-}
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
deleted file mode 100644
index cd3046c62c..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.util.Collection;
-
-public interface CDComponent {
-
- String getC();
- String getC2();
- String getD();
- String getNoSource();
- String getFileProperty();
- Collection<String> getManyValuesFileProperty();
- int getOverrideValue();
-}
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
deleted file mode 100644
index aec71d30f9..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Property;
-
-public class CDComponentImpl implements CDComponent {
-
- private String cProperty;
- private String dProperty;
- private String nosource;
- private String fileProperty;
- private Collection<String> manyValuesFileProperty;
- private int overrideNumber;
- private String cProperty2;
-
- @Property(name="nonFileProperty")
- public void setC2(final String value) {
- this.cProperty2 = value;
- }
- @Property(name="two")
- public void setOverrideNumber(final int value) {
- this.overrideNumber = value;
- }
-
- @Property(name="fileProperty")
- public void setFileProp(final String value) {
- this.fileProperty = value;
- }
-
- @Property(name="manyValuesFileProperty")
- public void setFileManyValueProp(final Collection<String> values) {
- this.manyValuesFileProperty = values;
- }
-
- @Property
- public void setC(final String C) {
- this.cProperty = C;
- }
-
- @Property
- public void setD(final String D) {
- this.dProperty = D;
- }
-
- @Property
- public void setNosource(final String value) {
- this.nosource = value;
- }
-
- public String getFileProperty() {
- return this.fileProperty;
- }
-
- public String getC() {
- return this.cProperty;
- }
-
- public String getC2() {
- return this.cProperty2;
- }
-
- public String getD() {
- return this.dProperty;
- }
-
- public String getNoSource() {
- return this.nosource;
- }
-
- public int getOverrideValue() {
- return this.overrideNumber;
- }
- public Collection<String> getManyValuesFileProperty() {
- return this.manyValuesFileProperty;
- }
-}
-
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
deleted file mode 100644
index 559b9ea327..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.itest;
-
-public class ComplexPropertyBean {
-
- protected int integerNumber = 25;
- public float floatNumber = 50;
- public double doubleNumber = 75;
- public int[] intArray = null;
- public double[] doubleArray = null;
- protected String[] stringArray = null;
-
- ComplexPropertyBean numberSet;
- public ComplexPropertyBean[] numberSetArray = null;
-
- public ComplexPropertyBean() {
-
- }
-
- public double getDoubleNumber() {
- return doubleNumber;
- }
-
- public void setDoubleNumber(double doubleNumber) {
- this.doubleNumber = doubleNumber;
- }
-
- public float getFloatNumber() {
- return floatNumber;
- }
-
- public void setFloatNumber(float floatNumber) {
- this.floatNumber = floatNumber;
- }
-
- public int getIntegerNumber() {
- return integerNumber;
- }
-
- public void setIntegerNumber(int integerNumber) {
- this.integerNumber = integerNumber;
- }
-
- public ComplexPropertyBean getNumberSet() {
- return numberSet;
- }
-
- public void setNumberSet(ComplexPropertyBean numberSet) {
- this.numberSet = numberSet;
- }
-
- @Override
- public String toString() {
- return Double.toString(integerNumber) + " - " +
- Double.toString(floatNumber) + " - " +
- Double.toString(doubleNumber) + " \n" +
- ((intArray == null ) ? "" : intArray[0] + " - " + intArray[1] + " \n " ) +
- ((doubleArray == null ) ? "" : doubleArray[0] + " - " + doubleArray[1] + " \n " ) +
- ((stringArray == null ) ? "" : stringArray[0] + " - " + stringArray[1] + " \n " ) +
- ((numberSetArray == null ) ? "" : numberSetArray[0] + " - " + numberSetArray[1] + " \n " ) +
- ((numberSet == null ) ? "" : numberSet.toString());
- }
-
- public String[] getStringArray() {
- return stringArray;
- }
-
- public void setStringArray(String[] stringArray) {
- this.stringArray = stringArray;
- }
-}
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
deleted file mode 100644
index 116cdef48f..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.itest;
-
-public interface OverrideService {
-
-}
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
deleted file mode 100644
index a36bb5e419..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.itest;
-
-public class OverrideServiceImpl implements OverrideService {
-
-}
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
deleted file mode 100644
index 459cf2be09..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.util.Collection;
-
-import commonj.sdo.DataObject;
-
-
-public interface PropertyComponent {
- public String getLocation();
- public String getYear();
- public ComplexPropertyBean getComplexPropertyOne();
- public ComplexPropertyBean getComplexPropertyTwo();
- public ComplexPropertyBean getComplexPropertyThree();
- public Collection<ComplexPropertyBean> getComplexPropertyFour();
- public DataObject getSdoProperty();
- public DataObject getCustomerSdo();
-}
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
deleted file mode 100644
index cdf381a553..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Property;
-
-import com.example.customer.sdo.impl.CustomerImpl;
-import commonj.sdo.DataObject;
-
-public class PropertyComponentImpl implements PropertyComponent {
-
- @Property
- protected CustomerImpl customerSdo;
-
- @Property
- protected DataObject sdoProperty;
-
- @Property
- protected ComplexPropertyBean complexPropertyOne;
-
- @Property
- protected ComplexPropertyBean complexPropertyTwo;
-
- @Property
- protected ComplexPropertyBean complexPropertyThree;
-
- @Property
- protected Collection<ComplexPropertyBean> complexPropertyFour;
-
- @Property(name = "location")
- protected String location = "RTP";
-
- @Property(name = "year")
- protected String year = "2006";
-
- public String getLocation(){
- return location;
- }
-
- public String getYear(){
- return year;
- }
-
- public ComplexPropertyBean getComplexPropertyOne() {
- //System.out.println(complexPropertyOne);
- return complexPropertyOne;
- }
-
- public ComplexPropertyBean getComplexPropertyTwo() {
- //System.out.println(complexPropertyTwo);
- return complexPropertyTwo;
- }
-
- public ComplexPropertyBean getComplexPropertyThree() {
- //System.out.println(complexPropertyThree);
- return complexPropertyThree;
- }
-
- public Collection<ComplexPropertyBean> getComplexPropertyFour() {
- //System.out.println(complexPropertyThree);
- return complexPropertyFour;
- }
-
- public DataObject getSdoProperty() {
- return sdoProperty;
- }
-
- public void setSdoProperty(DataObject sdoProperty) {
- System.out.println("Reached here da machi");
- this.sdoProperty = sdoProperty;
- }
-
- public CustomerImpl getCustomerSdo() {
- return customerSdo;
- }
-
- public void setCustomerSdo(CustomerImpl customerSdo) {
- this.customerSdo = customerSdo;
- }
-}
diff --git a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
deleted file mode 100644
index f20d295a06..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.itest;
-
-public interface PropertyService {
-
-}
diff --git a/branches/sca-java-1.0/itest/properties/src/main/resources/Outer.composite b/branches/sca-java-1.0/itest/properties/src/main/resources/Outer.composite
deleted file mode 100644
index b3e529e8b5..0000000000
--- a/branches/sca-java-1.0/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://www.osoa.org/xmlns/sca/1.0"
- xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" 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/branches/sca-java-1.0/itest/properties/src/main/resources/OuterPropertyTest.composite b/branches/sca-java-1.0/itest/properties/src/main/resources/OuterPropertyTest.composite
deleted file mode 100644
index 5237e964a3..0000000000
--- a/branches/sca-java-1.0/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://www.osoa.org/xmlns/sca/1.0"
- 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">
- <foo:MyComplexValue xsi:type="foo:MyComplexType" >
- <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>
- </foo:MyComplexValue>
- </property>
- </component>
-</composite>
-
diff --git a/branches/sca-java-1.0/itest/properties/src/main/resources/PropertyTest.composite b/branches/sca-java-1.0/itest/properties/src/main/resources/PropertyTest.composite
deleted file mode 100644
index 5eeb4457be..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/resources/PropertyTest.composite
+++ /dev/null
@@ -1,214 +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://www.osoa.org/xmlns/sca/1.0"
- xmlns:foo="http://foo"
- xmlns:cust="http://www.example.com/Customer"
- xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- 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>
-
- <dbsdo:import.sdo location="customer.xsd" />
- <!-- dbsdo:import.sdo factory="com.example.customer.sdo.SdoFactory" / -->
-
- <property name="number" type="xsd:int">1</property>
- <property name="complex" type="foo:MyComplexType" >
- <foo:MyComplexValue xsi:type="foo:MyComplexType" >
- <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>
- </foo:MyComplexValue>
- </property>
-
- <property name="moreComplex" type="foo:MyMoreComplexType">
- <foo:MyMoreComplexValue xsi:type="foo:MyMoreComplexType">
- <foo:numberSetArray>
- <foo:integerNumber>1</foo:integerNumber>
- <foo:floatNumber>11</foo:floatNumber>
- <foo:doubleNumber>111</foo:doubleNumber>
- </foo:numberSetArray>
- <foo:numberSetArray>
- <foo:integerNumber>2</foo:integerNumber>
- <foo:floatNumber>22</foo:floatNumber>
- <foo:doubleNumber>222</foo:doubleNumber>
- </foo:numberSetArray>
- <foo:stringArray>TestString_1</foo:stringArray>
- <foo:intArray>10</foo:intArray>
- <foo:stringArray>TestString_2</foo:stringArray>
- <foo:intArray>20</foo:intArray>
- <foo:integerNumber>27</foo:integerNumber>
- <foo:floatNumber>79.34</foo:floatNumber>
- <foo:doubleNumber>184.52</foo:doubleNumber>
- <foo:doubleArray>50.05</foo:doubleArray>
- <foo:doubleArray>25.52</foo:doubleArray>
- <foo:numberSet>
- <foo:integerNumber>54</foo:integerNumber>
- <foo:floatNumber>158.68</foo:floatNumber>
- <foo:doubleNumber>369.04</foo:doubleNumber>
- </foo:numberSet>
- </foo:MyMoreComplexValue>
- </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:MyComplexValue/foo:a"/>
- <property name="b" source="$complex/foo:MyComplexValue/foo:b"/>
- <property name="f" source="$complex/foo:MyComplexValue/foo:a">f</property>
- <property name="xpath" source="$complex/foo:MyComplexValue/foo:x/*[local-name()='z']"/>
- <property name="one" source="$number"/>
- <property name="foobar" many="true">"Apache" "Tuscany" "Java SCA"</property>
- <property name="fooInts" many="true">123 456 789</property>
- </component>
-
-
- <component name="CDComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.CDComponentImpl"/>
- <property name="c" source="$complex/foo:MyComplexValue/foo:c"/>
- <property name="d" source="$complex/foo:MyComplexValue/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:MyComplexValue/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">
- <foo:MyAnotherComplexValue>
- <foo:stringArray>TestString_1</foo:stringArray>
- <foo:stringArray>TestString_2</foo:stringArray>
- <foo:intArray>10</foo:intArray>
- <foo:integerNumber>27</foo:integerNumber>
- <foo:floatNumber>79.34</foo:floatNumber>
- <foo:doubleArray>25.52</foo:doubleArray>
- <foo:doubleNumber>184.52</foo:doubleNumber>
- <foo:doubleArray>50.05</foo:doubleArray>
- <foo:intArray>20</foo:intArray>
- <foo:numberSetArray>
- <foo:integerNumber>1</foo:integerNumber>
- <foo:floatNumber>11</foo:floatNumber>
- <foo:doubleNumber>111</foo:doubleNumber>
- </foo:numberSetArray>
- <foo:numberSetArray>
- <foo:integerNumber>2</foo:integerNumber>
- <foo:floatNumber>22</foo:floatNumber>
- <foo:doubleNumber>222</foo:doubleNumber>
- </foo:numberSetArray>
- <foo:numberSet>
- <foo:integerNumber>54</foo:integerNumber>
- <foo:floatNumber>158.68</foo:floatNumber>
- <foo:doubleNumber>369.04</foo:doubleNumber>
- </foo:numberSet>
- </foo:MyAnotherComplexValue>
- </property>
- <property name="complexPropertyThree" element="foo:PropertyThreeElement">
- <foo:PropertyThreeElement>
- <foo:stringArray>TestElementString_1</foo:stringArray>
- <foo:stringArray>TestElementString_2</foo:stringArray>
- <foo:intArray>10</foo:intArray>
- <foo:integerNumber>27</foo:integerNumber>
- <foo:floatNumber>79.34</foo:floatNumber>
- <foo:doubleArray>25.52</foo:doubleArray>
- <foo:doubleNumber>184.52</foo:doubleNumber>
- <foo:doubleArray>50.05</foo:doubleArray>
- <foo:intArray>20</foo:intArray>
- <foo:numberSetArray>
- <foo:integerNumber>1</foo:integerNumber>
- <foo:floatNumber>11</foo:floatNumber>
- <foo:doubleNumber>111</foo:doubleNumber>
- </foo:numberSetArray>
- <foo:numberSetArray>
- <foo:integerNumber>2</foo:integerNumber>
- <foo:floatNumber>22</foo:floatNumber>
- <foo:doubleNumber>222</foo:doubleNumber>
- </foo:numberSetArray>
- <foo:numberSet>
- <foo:integerNumber>54</foo:integerNumber>
- <foo:floatNumber>158.68</foo:floatNumber>
- <foo:doubleNumber>369.04</foo:doubleNumber>
- </foo:numberSet>
- </foo:PropertyThreeElement>
- </property>
- <property name="complexPropertyFour" element="foo:PropertyFourElement" many="true">
- <foo:PropertyFourElement>
- <foo:integerNumber>1</foo:integerNumber>
- <foo:floatNumber>11.11</foo:floatNumber>
- <foo:doubleNumber>111.111</foo:doubleNumber>
- <foo:numberSet>
- <foo:integerNumber>11</foo:integerNumber>
- <foo:floatNumber>1111.1111</foo:floatNumber>
- <foo:doubleNumber>11111.11111</foo:doubleNumber>
- </foo:numberSet>
- </foo:PropertyFourElement>
- <foo:PropertyFourElement>
- <foo:integerNumber>2</foo:integerNumber>
- <foo:floatNumber>22.22</foo:floatNumber>
- <foo:doubleNumber>222.222</foo:doubleNumber>
- <foo:numberSet>
- <foo:integerNumber>22</foo:integerNumber>
- <foo:floatNumber>2222.2222</foo:floatNumber>
- <foo:doubleNumber>22222.22222</foo:doubleNumber>
- </foo:numberSet>
- </foo:PropertyFourElement>
- <foo:PropertyFourElement>
- <foo:integerNumber>3</foo:integerNumber>
- <foo:floatNumber>33.33</foo:floatNumber>
- <foo:doubleNumber>333.333</foo:doubleNumber>
- <foo:numberSet>
- <foo:integerNumber>33</foo:integerNumber>
- <foo:floatNumber>3333.3333</foo:floatNumber>
- <foo:doubleNumber>33333.33333</foo:doubleNumber>
- </foo:numberSet>
- </foo:PropertyFourElement>
- </property>
- <property name="sdoProperty" type="cust:Customer">
- <cust:customer>
- <cust:firstName>Firstly Name</cust:firstName>
- <cust:middleName>Middler Name</cust:middleName>
- <cust:lastName>Lasting Name</cust:lastName>
- </cust:customer>
- </property>
- <property name="customerSdo" type="cust:Customer">
- <cust:customer>
- <cust:firstName>Sdo Firstly Name</cust:firstName>
- <cust:middleName>Sdo Middler Name</cust:middleName>
- <cust:lastName>Sdo Lasting Name</cust:lastName>
- </cust:customer>
- </property>
- </component>
-</composite>
-
diff --git a/branches/sca-java-1.0/itest/properties/src/main/resources/customer.xsd b/branches/sca-java-1.0/itest/properties/src/main/resources/customer.xsd
deleted file mode 100644
index 8861d7e7b8..0000000000
--- a/branches/sca-java-1.0/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/branches/sca-java-1.0/itest/properties/src/main/resources/fileProperty.txt b/branches/sca-java-1.0/itest/properties/src/main/resources/fileProperty.txt
deleted file mode 100644
index 0d3d9ead83..0000000000
--- a/branches/sca-java-1.0/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>
diff --git a/branches/sca-java-1.0/itest/properties/src/main/resources/manyValuesFileProperty.txt b/branches/sca-java-1.0/itest/properties/src/main/resources/manyValuesFileProperty.txt
deleted file mode 100644
index 450f397b30..0000000000
--- a/branches/sca-java-1.0/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ /dev/null
@@ -1,23 +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.
--->
-
-<manyFilePropertyValues>
- "fileValueOne" "fileValueTwo" "fileValueThree" "fileValueFour"
-</manyFilePropertyValues>
diff --git a/branches/sca-java-1.0/itest/properties/src/main/resources/mySimpleService.composite b/branches/sca-java-1.0/itest/properties/src/main/resources/mySimpleService.composite
deleted file mode 100644
index 75fdd24add..0000000000
--- a/branches/sca-java-1.0/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://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0 ">
-
-
- <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>