summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-05-06 07:14:22 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-05-06 07:14:22 +0000
commitae2b3188fd9dfa9ff2b0e3987109f90146808c54 (patch)
treeedddff587cc51b302fdbc74c49dd5618461439fb /sca-java-2.x/trunk
parent59f06934196442456001f424f6a4a5a5441518e3 (diff)
Start bringing property itest up
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@941593 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java5
-rw-r--r--sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite2
-rw-r--r--sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite18
-rw-r--r--sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt2
-rw-r--r--sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt10
5 files changed, 19 insertions, 18 deletions
diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
index 7c700903d6..f44fed7389 100644
--- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
@@ -25,11 +25,10 @@ import org.oasisopen.sca.annotation.Service;
@Service(Bar.class)
public class Foo1 implements Bar {
- @Property
protected String bar;
- @Constructor( {"bar"})
- public Foo1(String b) {
+ @Constructor
+ public Foo1(@Property(name="bar") String b) {
this.bar = b;
}
diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite
index ae9da4541a..0c8714cbe1 100644
--- a/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite
@@ -26,7 +26,7 @@
<implementation.composite name="foo:PropertyTest" />
<property name="number">125</property>
<property name="complex" type="foo:MyComplexType">
- <value xsi:type="foo:MyComplexType">
+ <value>
<foo:a>Overriden A</foo:a>
<foo:b>Overriden B</foo:b>
<foo:c>Overriden C</foo:c>
diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite
index 285aaae8ca..7c834d5e0b 100644
--- a/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite
@@ -31,7 +31,7 @@
<property name="number" type="xsd:int">1</property>
<property name="complex" type="foo:MyComplexType" >
- <value xsi:type="foo:MyComplexType" >
+ <value>
<foo:a>a</foo:a>
<foo:b>b</foo:b>
<foo:c>c</foo:c>
@@ -89,10 +89,10 @@
<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="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>
@@ -109,19 +109,19 @@
<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="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:MyComplexValue/foo:c"/>
+ <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">
+ <property name="complexPropertyTwo" type="foo:MyMoreComplexType">
<value>
<stringArray>TestString_1</stringArray>
<stringArray>TestString_2</stringArray>
diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt b/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt
index 0d3d9ead83..7e932622ce 100644
--- a/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt
@@ -18,4 +18,4 @@
* under the License.
-->
-<filePropertyTest>fileValue</filePropertyTest>
+<filePropertyTest>fileValue</filePropertyTest> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt
index 6d4180ee2f..e037537d7d 100644
--- a/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt
@@ -17,7 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<manyFilePropertyValues>fileValueOne</<manyFilePropertyValues>
-<manyFilePropertyValues>fileValueTwo</<manyFilePropertyValues>
-<manyFilePropertyValues>fileValueThree</<manyFilePropertyValues>
-<manyFilePropertyValues>fileValueFour</<manyFilePropertyValues>
+<value>
+ <manyFilePropertyValues>fileValueOne</manyFilePropertyValues>
+ <manyFilePropertyValues>fileValueTwo</manyFilePropertyValues>
+ <manyFilePropertyValues>fileValueThree</manyFilePropertyValues>
+ <manyFilePropertyValues>fileValueFour</manyFilePropertyValues>
+</value> \ No newline at end of file