Author: slaws
Date: Thu May 6 07:14:22 2010
New Revision: 941593
URL: http://svn.apache.org/viewvc?rev=941593&view=rev
Log:
Start bringing property itest up
Modified:
tuscany/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt
Modified:
tuscany/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java?rev=941593&r1=941592&r2=941593&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
Thu May 6 07:14:22 2010
@@ -25,11 +25,10 @@ import org.oasisopen.sca.annotation.Serv
@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;
}
Modified:
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite?rev=941593&r1=941592&r2=941593&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite
(original)
+++
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite
Thu May 6 07:14:22 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite?rev=941593&r1=941592&r2=941593&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite
(original)
+++
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite
Thu May 6 07:14:22 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt?rev=941593&r1=941592&r2=941593&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt
(original)
+++
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt
Thu May 6 07:14:22 2010
@@ -18,4 +18,4 @@
* under the License.
-->
-<filePropertyTest>fileValue</filePropertyTest>
+<filePropertyTest>fileValue</filePropertyTest>
\ No newline at end of file
Modified:
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt?rev=941593&r1=941592&r2=941593&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt
(original)
+++
tuscany/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt
Thu May 6 07:14:22 2010
@@ -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
