diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2011-09-14 13:16:39 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2011-09-14 13:16:39 +0000 |
| commit | 9d7c57a0e1c12472126c0888ef238c00d93e9001 (patch) | |
| tree | be6c90453a62a63174113e3615981e1346a2bc55 /sca-java-2.x/trunk/testing/itest/properties/src/main/resources/PropertyTest.composite | |
| parent | f0581d45620443a18a263018a49432f26c9027e2 (diff) | |
TUSCANY-3937 - Further fixes on top of Michael's patch to get the properties itest working. Mainly, builder changes to ignore null types (generated for non-JAXB pojos), update Node2JAXB to report validation errors so things don't go wrong silently, ensure default XMLType doesn't get updated, correct properties test to match OASIS, put properties test in the build.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1170598 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | sca-java-2.x/trunk/testing/itest/properties/src/main/resources/PropertyTest.composite | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/PropertyTest.composite index 7c834d5e0b..d89c1f82e0 100644 --- a/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/PropertyTest.composite +++ b/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/PropertyTest.composite @@ -43,13 +43,13 @@ </value> </property> - <property name="moreComplex" type="foo:MyMoreComplexType"> - <value> + <property name="moreComplex" type="MyMoreComplexType"> + <value xmlns=""> <numberSetArray> <integerNumber>1</integerNumber> <floatNumber>11</floatNumber> <doubleNumber>111</doubleNumber> - </numberSetArray> + </numberSetArray> <numberSetArray> <integerNumber>2</integerNumber> <floatNumber>22</floatNumber> @@ -68,12 +68,12 @@ <integerNumber>54</integerNumber> <floatNumber>158.68</floatNumber> <doubleNumber>369.04</doubleNumber> - </numberSet> + </numberSet> </value> </property> - <property name="complexFoo" type="foo:MyMoreComplexType"> - <value> + <property name="complexFoo" type="MyMoreComplexType"> + <value xmlns=""> <stringArray>TestString_3</stringArray> <stringArray>TestString_4</stringArray> <intArray>100</intArray> @@ -114,15 +114,15 @@ <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="nonFileProperty" 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> + <property name="complexPropertyTwo" type="MyMoreComplexType"> + <value xmlns=""> <stringArray>TestString_1</stringArray> <stringArray>TestString_2</stringArray> <intArray>10</intArray> @@ -150,7 +150,7 @@ </value> </property> <property name="complexPropertyThree" element="foo:PropertyThreeElement"> - <PropertyThreeElement xmlns="http://foo"> + <PropertyThreeElement xmlns=""> <stringArray>TestElementString_1</stringArray> <stringArray>TestElementString_2</stringArray> <intArray>10</intArray> @@ -177,8 +177,8 @@ </numberSet> </PropertyThreeElement> </property> - <property name="complexPropertyFour" element="foo:PropertyFourElement" many="true"> - <PropertyFourElement xmlns="http://foo"> + <property name="complexPropertyFour" element="PropertyFourElement" many="true"> + <PropertyFourElement xmlns=""> <integerNumber>1</integerNumber> <floatNumber>11.11</floatNumber> <doubleNumber>111.111</doubleNumber> @@ -188,7 +188,7 @@ <doubleNumber>11111.11111</doubleNumber> </numberSet> </PropertyFourElement> - <PropertyFourElement xmlns="http://foo"> + <PropertyFourElement xmlns=""> <integerNumber>2</integerNumber> <floatNumber>22.22</floatNumber> <doubleNumber>222.222</doubleNumber> @@ -198,7 +198,7 @@ <doubleNumber>22222.22222</doubleNumber> </numberSet> </PropertyFourElement> - <PropertyFourElement xmlns="http://foo"> + <PropertyFourElement xmlns=""> <integerNumber>3</integerNumber> <floatNumber>33.33</floatNumber> <doubleNumber>333.333</doubleNumber> |