You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2007/06/06 14:15:35 UTC
svn commit: r544820 - in /incubator/tuscany/java/sca/itest/properties: ./
src/main/java/com/ src/main/java/org/apache/tuscany/sca/itest/
src/main/resources/ src/test/java/org/apache/tuscany/sca/itest/
Author: svkrish
Date: Wed Jun 6 05:15:34 2007
New Revision: 544820
URL: http://svn.apache.org/viewvc?view=rev&rev=544820
Log:
added static sdo type property test
Removed:
incubator/tuscany/java/sca/itest/properties/src/main/java/com/
Modified:
incubator/tuscany/java/sca/itest/properties/pom.xml
incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite
incubator/tuscany/java/sca/itest/properties/src/main/resources/customer.xsd
incubator/tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
Modified: incubator/tuscany/java/sca/itest/properties/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/pom.xml?view=diff&rev=544820&r1=544819&r2=544820
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/properties/pom.xml Wed Jun 6 05:15:34 2007
@@ -55,5 +55,30 @@
<version>1.0-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
- </dependencies>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-plugin</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate-customer-sdo</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <schemaFile>${basedir}/src/main/resources/customer.xsd</schemaFile>
+ <javaPackage>com.example.customer.sdo</javaPackage>
+ <noNotification>true</noNotification>
+ <noContainer>true</noContainer>
+ <noUnsettable>true</noUnsettable>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java?view=diff&rev=544820&r1=544819&r2=544820
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java (original)
+++ incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java Wed Jun 6 05:15:34 2007
@@ -23,7 +23,7 @@
import org.osoa.sca.annotations.Property;
-import com.example.customer.impl.CustomerImpl;
+import com.example.customer.sdo.impl.CustomerImpl;
import commonj.sdo.DataObject;
public class PropertyComponentImpl implements PropertyComponent {
Modified: incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite?view=diff&rev=544820&r1=544819&r2=544820
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite (original)
+++ incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite Wed Jun 6 05:15:34 2007
@@ -28,7 +28,7 @@
</service>
<dbsdo:import.sdo location="customer.xsd" />
- <!-- dbsdo:import.sdo factory="com.example.customer.SdoFactory" /-->
+ <dbsdo:import.sdo factory="com.example.customer.sdo.SdoFactory" />
<property name="number" type="xsd:int">1</property>
<property name="complex" type="foo:MyComplexType" >
@@ -200,13 +200,13 @@
<cust:lastName>Lasting Name</cust:lastName>
</cust:customer>
</property>
- <!-- property name="customerSdo" type="cust:Customer">
- <cust:Customer>
+ <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-->
+ </cust:customer>
+ </property>
</component>
</composite>
Modified: incubator/tuscany/java/sca/itest/properties/src/main/resources/customer.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/main/resources/customer.xsd?view=diff&rev=544820&r1=544819&r2=544820
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/src/main/resources/customer.xsd (original)
+++ incubator/tuscany/java/sca/itest/properties/src/main/resources/customer.xsd Wed Jun 6 05:15:34 2007
@@ -4,9 +4,9 @@
<xsd:element name="customer" type="Customer"/>
<xsd:complexType name="Customer">
<xsd:sequence>
- <xsd:element name="firstName" type="xsd:string"/>
+ <xsd:element name="firstName" type="xsd:string"/>
<xsd:element name="middleName" type="xsd:string"/>
- <xsd:element ref="lastName" type="xsd:string"/>
+ <xsd:element name="lastName" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
</xsd:schema>
Modified: incubator/tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java?view=diff&rev=544820&r1=544819&r2=544820
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java Wed Jun 6 05:15:34 2007
@@ -180,14 +180,14 @@
assertEquals("Lasting Name", dataObject.getString("lastName"));
}
- /*@Test
+ @Test
public void testSDOProperty2() {
DataObject dataObject = propertyService.getCustomerSdo();
assertNotNull(dataObject);
- assertEquals("Customer Firstly Name", dataObject.get("firstName"));
- assertEquals("Customer Middler Name", dataObject.getString("middleName"));
- assertEquals("Customer Lasting Name", dataObject.getString("lastName"));
- }*/
+ assertEquals("Sdo Firstly Name", dataObject.get("firstName"));
+ assertEquals("Sdo Middler Name", dataObject.getString("middleName"));
+ assertEquals("Sdo Lasting Name", dataObject.getString("lastName"));
+ }
@BeforeClass
public static void init() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org