You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/10/26 20:28:14 UTC
svn commit: r588736 - in /incubator/tuscany/java/sdo/tools-test: pom.xml
src/test/java/org/apache/tuscany/sdo/test/ListWithDefaultTestCase.java
Author: rfeng
Date: Fri Oct 26 11:28:12 2007
New Revision: 588736
URL: http://svn.apache.org/viewvc?rev=588736&view=rev
Log:
Fix the build break of the tools-test (Add a code-gen for xsdlistitem)
Modified:
incubator/tuscany/java/sdo/tools-test/pom.xml
incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/ListWithDefaultTestCase.java
Modified: incubator/tuscany/java/sdo/tools-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools-test/pom.xml?rev=588736&r1=588735&r2=588736&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools-test/pom.xml (original)
+++ incubator/tuscany/java/sdo/tools-test/pom.xml Fri Oct 26 11:28:12 2007
@@ -1,183 +1,240 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <parent>
- <artifactId>tuscany-sdo</artifactId>
- <groupId>org.apache.tuscany.sdo</groupId>
- <version>1.0-incubating-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-tools-test</artifactId>
- <name>Test the SDO Generator Tools and Tool Outputs</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>${sdo.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-lib</artifactId>
- <version>${sdo.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-tools</artifactId>
- <version>${sdo.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>${sdo.version}</version>
- <executions>
- <execution>
- <id>simple</id>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/simple.xsd</schemaFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>simpleWithChangeSummary</id>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/simpleWithChangeSummary.xsd</schemaFile>
- <prefix>CS</prefix>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>simpleNoInterfaces</id>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/simpleNoIF.xsd</schemaFile>
- <javaPackage>com.example.noInterfaces.simple</javaPackage>
- <noInterfaces>true</noInterfaces>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>customer</id>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/CustomerAccount.xsd</schemaFile>
- <prefix>Customer</prefix>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>extensible</id>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/extensible/customer.xsd</schemaFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>extensible_infostreet</id>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/extensible/infostreet.xsd</schemaFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>subgroup</id>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/subgroup.xsd</schemaFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>openContent</id>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/Open.xsd</schemaFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>MixedTypesStaticPart</id>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/mixedTypesStatic.xsd</schemaFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>SimpleNoTns</id>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/simpleNoTns.xsd</schemaFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>XSDImportOnly</id>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/xsdImportOnly.wsdl</schemaFile>
- <schemaNamespace>all</schemaNamespace>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>listAccess</id>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/listAccess.xsd</schemaFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-
+<?xml version="1.0"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+ <parent>
+ <artifactId>tuscany-sdo</artifactId>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-tools-test</artifactId>
+ <name>Test the SDO Generator Tools and Tool Outputs</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ <version>${sdo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-lib</artifactId>
+ <version>${sdo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-tools</artifactId>
+ <version>${sdo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/sdo-source</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-plugin</artifactId>
+ <version>${sdo.version}</version>
+ <executions>
+ <execution>
+ <id>simple</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/simple.xsd
+ </schemaFile>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>simpleWithChangeSummary</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/simpleWithChangeSummary.xsd
+ </schemaFile>
+ <prefix>CS</prefix>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>xsdListItem</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/xsdlistitem.xsd
+ </schemaFile>
+ <prefix>LI</prefix>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>simpleNoInterfaces</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/simpleNoIF.xsd
+ </schemaFile>
+ <javaPackage>
+ com.example.noInterfaces.simple
+ </javaPackage>
+ <noInterfaces>true</noInterfaces>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>customer</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/CustomerAccount.xsd
+ </schemaFile>
+ <prefix>Customer</prefix>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>extensible</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/extensible/customer.xsd
+ </schemaFile>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>extensible_infostreet</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/extensible/infostreet.xsd
+ </schemaFile>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>subgroup</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/subgroup.xsd
+ </schemaFile>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>openContent</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/Open.xsd
+ </schemaFile>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>MixedTypesStaticPart</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/mixedTypesStatic.xsd
+ </schemaFile>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>SimpleNoTns</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/simpleNoTns.xsd
+ </schemaFile>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>XSDImportOnly</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/xsdImportOnly.wsdl
+ </schemaFile>
+ <schemaNamespace>all</schemaNamespace>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>listAccess</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/listAccess.xsd
+ </schemaFile>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
</project>
Modified: incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/ListWithDefaultTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/ListWithDefaultTestCase.java?rev=588736&r1=588735&r2=588736&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/ListWithDefaultTestCase.java (original)
+++ incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/ListWithDefaultTestCase.java Fri Oct 26 11:28:12 2007
@@ -24,8 +24,8 @@
import junit.framework.TestCase;
import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.test.xsdlistwitdefault.SubCategoryType;
-import org.apache.tuscany.sdo.test.xsdlistwitdefault.XsdlistwitdefaultFactory;
+import org.example.address.with.list.LIFactory;
+import org.example.address.with.list.SubCategoryType;
import commonj.sdo.helper.HelperContext;
@@ -44,7 +44,7 @@
super.setUp();
scope = SDOUtil.createHelperContext();
- XsdlistwitdefaultFactory.INSTANCE.register(scope);
+ LIFactory.INSTANCE.register(scope);
}
protected void tearDown() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org