You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by bd...@apache.org on 2006/11/06 23:12:00 UTC
svn commit: r471894 - in
/incubator/tuscany/sandbox/bdaniel/propertyTest/src: main/java/testing/
main/resources/META-INF/sca/ test/java/testing/
Author: bdaniel
Date: Mon Nov 6 14:11:59 2006
New Revision: 471894
URL: http://svn.apache.org/viewvc?view=rev&rev=471894
Log:
update propertytest sandbox
Added:
incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/OverrideService.java
incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/OverrideServiceImpl.java
incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/PropertyService.java
incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/resources/META-INF/sca/fileProperty.txt
Modified:
incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/ABComponent.java
incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/ABComponentImpl.java
incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/CDComponent.java
incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/CDComponentImpl.java
incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/sandbox/bdaniel/propertyTest/src/test/java/testing/PropertyITest.java
Modified: incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/ABComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/ABComponent.java?view=diff&rev=471894&r1=471893&r2=471894
==============================================================================
--- incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/ABComponent.java (original)
+++ incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/ABComponent.java Mon Nov 6 14:11:59 2006
@@ -4,5 +4,7 @@
String getA();
String getB();
+ String getZ();
int getIntValue();
+ String getF();
}
Modified: incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/ABComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/ABComponentImpl.java?view=diff&rev=471894&r1=471893&r2=471894
==============================================================================
--- incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/ABComponentImpl.java (original)
+++ incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/ABComponentImpl.java Mon Nov 6 14:11:59 2006
@@ -7,7 +7,20 @@
private String aProperty;
private String bProperty;
private int intValue;
+ // private Collection manyProp;
+ private String zProperty;
+ private String fProperty;
+ @Property(name="xpath")
+ public void setZProperty(final String value) {
+ this.zProperty = value;
+ }
+
+// @Property(name="foobar")
+// public void setCollectionProperty(final Collection value) {
+// this.manyProp = value;
+// }
+
@Property
public void setA(final String A) {
this.aProperty = A;
@@ -18,6 +31,11 @@
this.bProperty = B;
}
+ @Property
+ public void setF(final String F) {
+ this.fProperty = F;
+ }
+
@Property
public void setOne(final int value) {
this.intValue = value;
@@ -33,5 +51,13 @@
public int getIntValue() {
return this.intValue;
+ }
+
+ public String getZ() {
+ return this.zProperty;
+ }
+
+ public String getF() {
+ return this.fProperty;
}
}
Modified: incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/CDComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/CDComponent.java?view=diff&rev=471894&r1=471893&r2=471894
==============================================================================
--- incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/CDComponent.java (original)
+++ incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/CDComponent.java Mon Nov 6 14:11:59 2006
@@ -1,11 +1,11 @@
package testing;
-/**
- * @version $Rev: 465498 $ $Date: 2006-10-19 01:23:25 -0400 (Thu, 19 Oct 2006) $
- */
public interface CDComponent {
String getC();
+ String getC2();
String getD();
String getNoSource();
+ String getFileProperty();
+ int getOverrideValue();
}
Modified: incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/CDComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/CDComponentImpl.java?view=diff&rev=471894&r1=471893&r2=471894
==============================================================================
--- incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/CDComponentImpl.java (original)
+++ incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/CDComponentImpl.java Mon Nov 6 14:11:59 2006
@@ -7,7 +7,23 @@
private String cProperty;
private String dProperty;
private String nosource;
+ private String fileProperty;
+ 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
public void setC(final String C) {
this.cProperty = C;
@@ -23,16 +39,28 @@
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;
}
}
Added: incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/OverrideService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/OverrideService.java?view=auto&rev=471894
==============================================================================
--- incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/OverrideService.java (added)
+++ incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/OverrideService.java Mon Nov 6 14:11:59 2006
@@ -0,0 +1,5 @@
+package testing;
+
+public interface OverrideService {
+
+}
Added: incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/OverrideServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/OverrideServiceImpl.java?view=auto&rev=471894
==============================================================================
--- incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/OverrideServiceImpl.java (added)
+++ incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/OverrideServiceImpl.java Mon Nov 6 14:11:59 2006
@@ -0,0 +1,5 @@
+package testing;
+
+public class OverrideServiceImpl implements OverrideService {
+
+}
Added: incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/PropertyService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/PropertyService.java?view=auto&rev=471894
==============================================================================
--- incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/PropertyService.java (added)
+++ incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/java/testing/PropertyService.java Mon Nov 6 14:11:59 2006
@@ -0,0 +1,5 @@
+package testing;
+
+public interface PropertyService {
+
+}
Modified: incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=471894&r1=471893&r2=471894
==============================================================================
--- incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/resources/META-INF/sca/default.scdl Mon Nov 6 14:11:59 2006
@@ -21,6 +21,8 @@
xmlns:foo="http://foo"
name="PropertyTest">
+ <!-- <property name="manyValued" type="xsd:string" many="true"/> -->
+
<property name="number" type="xsd:int">1</property>
<property name="complex" type="foo:MyComplexType">
@@ -28,6 +30,11 @@
<foo:b>b</foo:b>
<foo:c>c</foo:c>
<foo:d>d</foo:d>
+ <foo:x>
+ <y>y</y>
+ <z>z</z>
+ </foo:x>
+
</property>
<component name="ABCDComponent">
@@ -40,7 +47,9 @@
<implementation.java class="testing.ABComponentImpl"/>
<property name="a" source="$complex/foo:a"/>
<property name="b" source="$complex/foo:b"/>
- <property name="one" source="$number"/>
+ <property name="f" source="$complex/foo:a">f</property>
+ <property name="xpath" source="$complex/foo:x/*[local-name()='z']"/>
+ <property name="one" source="$number"/>
</component>
<component name="CDComponent">
@@ -48,6 +57,13 @@
<property name="c" source="$complex/foo:c"/>
<property name="d" source="$complex/foo:d"/>
<property name="nosource">aValue</property>
+ <property name="fileProperty" file="META-INF/sca/fileProperty.txt"/>
+ <property name="nonFileProperty" file="META-INF/sca/fileProperty.txt" source="$complex/foo:c"/>
+ <property name="two" source="$number">2</property>
</component>
+<!-- <component name="Override">
+ <implementation.composite name="OverrideComposite" scdlLocation="override.scdl"/>
+ </component>
+ -->
</composite>
Added: incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/resources/META-INF/sca/fileProperty.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/resources/META-INF/sca/fileProperty.txt?view=auto&rev=471894
==============================================================================
--- incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/resources/META-INF/sca/fileProperty.txt (added)
+++ incubator/tuscany/sandbox/bdaniel/propertyTest/src/main/resources/META-INF/sca/fileProperty.txt Mon Nov 6 14:11:59 2006
@@ -0,0 +1 @@
+<filePropertyTest>fileValue</filePropertyTest>
Modified: incubator/tuscany/sandbox/bdaniel/propertyTest/src/test/java/testing/PropertyITest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/bdaniel/propertyTest/src/test/java/testing/PropertyITest.java?view=diff&rev=471894&r1=471893&r2=471894
==============================================================================
--- incubator/tuscany/sandbox/bdaniel/propertyTest/src/test/java/testing/PropertyITest.java (original)
+++ incubator/tuscany/sandbox/bdaniel/propertyTest/src/test/java/testing/PropertyITest.java Mon Nov 6 14:11:59 2006
@@ -1,12 +1,14 @@
package testing;
import junit.framework.TestCase;
+
import org.osoa.sca.CurrentCompositeContext;
public class PropertyITest extends TestCase {
private ABComponent abService;
private CDComponent cdService;
private ABCDComponent abcdService;
+ // private PropertyService propertyService;
public void testA() {
@@ -21,17 +23,42 @@
assertEquals("c", cdService.getC());
}
+ public void testC2() {
+ assertEquals("c", cdService.getC2());
+ }
public void testD() {
assertEquals("d", cdService.getD());
}
+ public void testF() {
+ assertEquals("f", abService.getF());
+ }
+
+ public void testZ() {
+ assertEquals("z", abService.getZ());
+ }
+
+
public void testIntValue() {
assertEquals(1, abService.getIntValue());
}
+
+ public void testDefaultValue() {
+ assertEquals(1, abService.getIntValue());
+ }
+
+ public void testDefaultValueOverride() {
+ assertEquals(2, cdService.getOverrideValue());
+ }
+
public void testNoSource() {
assertEquals("aValue", cdService.getNoSource());
}
+ public void testFileProperty() {
+ assertEquals("fileValue", cdService.getFileProperty());
+ }
+
public void testABCD() {
assertEquals("a", abcdService.getA());
assertEquals("b", abcdService.getB());
@@ -44,5 +71,6 @@
abService = CurrentCompositeContext.getContext().locateService(ABComponent.class, "ABComponent");
cdService = CurrentCompositeContext.getContext().locateService(CDComponent.class, "CDComponent");
abcdService = CurrentCompositeContext.getContext().locateService(ABCDComponent.class, "ABCDComponent");
+ // propertyService = CurrentCompositeContext.getContext().locateService(PropertyService.class, "PropertyService");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org