You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by em...@apache.org on 2007/03/14 06:21:16 UTC
svn commit: r518024 - in /incubator/cxf/trunk: ./
codegen-plugin2/src/main/java/org/apache/cxf/maven_plugin/ metacode/ rt/
rt/bindings/soap/ rt/bindings/xml/
rt/bindings/xml/src/main/resources/META-INF/
rt/bindings/xml/src/main/resources/schemas/ rt/fr...
Author: ema
Date: Tue Mar 13 22:21:15 2007
New Revision: 518024
URL: http://svn.apache.org/viewvc?view=rev&rev=518024
Log:
[CXF-222]Replaced tools with tools2 ,updated the dependencies related to old tools
Removed:
incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/extensions.xml
incubator/cxf/trunk/rt/bindings/xml/src/main/resources/schemas/
incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/extensions.xml
incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/
Modified:
incubator/cxf/trunk/codegen-plugin2/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
incubator/cxf/trunk/metacode/pom.xml
incubator/cxf/trunk/pom.xml
incubator/cxf/trunk/rt/bindings/soap/pom.xml
incubator/cxf/trunk/rt/bindings/xml/pom.xml
incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
incubator/cxf/trunk/rt/management/pom.xml
incubator/cxf/trunk/rt/pom.xml
incubator/cxf/trunk/rt/transports/http/pom.xml
incubator/cxf/trunk/rt/transports/http2/pom.xml
incubator/cxf/trunk/rt/transports/jms/pom.xml
incubator/cxf/trunk/rt/ws/policy/pom.xml
incubator/cxf/trunk/rt/ws/rm/pom.xml
incubator/cxf/trunk/systests/pom.xml
incubator/cxf/trunk/testutils/pom.xml
incubator/cxf/trunk/tools2/pom.xml
incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
incubator/cxf/trunk/tools2/xjc/dv/pom.xml
incubator/cxf/trunk/tools2/xjc/pom.xml
Modified: incubator/cxf/trunk/codegen-plugin2/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin2/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/codegen-plugin2/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java (original)
+++ incubator/cxf/trunk/codegen-plugin2/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java Tue Mar 13 22:21:15 2007
@@ -39,19 +39,19 @@
* @parameter
*/
String testSourceRoot;
-
+
/**
* @parameter expression="${project.build.directory}/generated/src/main/java"
* @required
*/
String sourceRoot;
-
+
/**
* @parameter expression="${project.build.outputDirectory}"
* @required
*/
String classesDirectory;
-
+
/**
* @parameter expression="${project.compileClasspathElements}"
* @required
@@ -63,8 +63,8 @@
* @required
*/
MavenProject project;
-
-
+
+
/**
* @parameter
*/
@@ -74,13 +74,13 @@
String outputDir = testSourceRoot == null ? sourceRoot : testSourceRoot;
File outputDirFile = new File(outputDir);
outputDirFile.mkdirs();
-
+
File classesDir = new File(classesDirectory);
classesDir.mkdirs();
-
+
if (wsdlOptions == null) {
- throw new MojoExecutionException("Must specify wsdlOptions");
+ throw new MojoExecutionException("Must specify wsdlOptions");
}
StringBuffer buf = new StringBuffer();
@@ -90,7 +90,7 @@
buf.append(File.pathSeparatorChar);
}
String newCp = buf.toString();
-
+
String cp = System.getProperty("java.class.path");
SecurityManager oldSm = System.getSecurityManager();
long timestamp = CodegenUtils.getCodegenTimestamp();
@@ -98,9 +98,6 @@
try {
System.setProperty("java.class.path", newCp);
System.setSecurityManager(new NoExitSecurityManager());
-
- System.out.println("----wsdlOptions.length--- " + wsdlOptions.length);
-
for (int x = 0; x < wsdlOptions.length; x++) {
processWsdl(wsdlOptions[x], outputDirFile, timestamp);
@@ -114,15 +111,17 @@
} finally {
System.setSecurityManager(oldSm);
System.setProperty("java.class.path", cp);
- }
+ }
if (project != null && sourceRoot != null) {
project.addCompileSourceRoot(sourceRoot);
}
if (project != null && testSourceRoot != null) {
project.addTestCompileSourceRoot(testSourceRoot);
- }
+ }
+
+ System.gc();
}
-
+
private void processWsdl(WsdlOption wsdlOption,
File outputDirFile,
long cgtimestamp) throws MojoExecutionException {
@@ -144,13 +143,13 @@
}
}
}
- }
-
-
-
+ }
+
+
+
if (doWork) {
-
- List list = new ArrayList();
+
+ List<String> list = new ArrayList<String>();
if (wsdlOption.getPackagenames() != null) {
Iterator it = wsdlOption.getPackagenames().iterator();
while (it.hasNext()) {
@@ -162,27 +161,23 @@
//list.add("-verbose");
list.add("-d");
list.add(outputDirFile.toString());
-
+
if (wsdlOption.getExtraargs() != null) {
Iterator it = wsdlOption.getExtraargs().iterator();
while (it.hasNext()) {
list.add(it.next().toString());
}
- }
- list.add(wsdlOption.getWsdl());
-
-
+ }
+ list.add(wsdlOption.getWsdl());
+
+
try {
try {
- System.out.println("----------MAVEN CODEGEN PLUGIN--------------");
StringBuffer strBuffer = new StringBuffer();
- for (int i = 0 ; i < list.size(); i++) {
+ for (int i = 0; i < list.size(); i++) {
strBuffer.append(list.get(i));
strBuffer.append(" ");
}
- System.out.println(strBuffer.toString());
- System.out.println("--------------------------------------------");
- //System.out.println
WSDLToJava.main((String[])list.toArray(new String[list.size()]));
doneFile.delete();
doneFile.createNewFile();
@@ -208,26 +203,26 @@
deleteDir(files[idx]);
}
}
-
+
if (f.exists()) {
return f.delete();
}
-
+
return true;
}
-
+
private boolean isDefServiceName(WsdlOption wsdlOption) {
List args = wsdlOption.extraargs;
if (args == null) {
return false;
}
- for (int i = 0 ; i < args.size(); i++) {
+ for (int i = 0; i < args.size(); i++) {
if ("-sn".equalsIgnoreCase((String)args.get(i))) {
return true;
}
}
return false;
-
+
}
-
+
}
Modified: incubator/cxf/trunk/metacode/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/metacode/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/metacode/pom.xml (original)
+++ incubator/cxf/trunk/metacode/pom.xml Tue Mar 13 22:21:15 2007
@@ -145,7 +145,7 @@
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-xjc-dv</artifactId>
+ <artifactId>cxf-tools2-xjc-dv</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Tue Mar 13 22:21:15 2007
@@ -123,14 +123,15 @@
<modules>
<module>buildtools</module>
<module>parent</module>
-
<module>common</module>
- <module>tools</module>
- <module>metacode</module>
- <module>codegen-plugin</module>
<module>api</module>
+ <module>rt/core</module>
+ <module>metacode</module>
+ <module>tools2</module>
+ <module>codegen-plugin2</module>
<module>testutils</module>
<module>rt</module>
+ <module>tools2/javato</module>
<module>integration</module>
<module>systests</module>
</modules>
Modified: incubator/cxf/trunk/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/soap/pom.xml Tue Mar 13 22:21:15 2007
@@ -40,9 +40,8 @@
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
+ <artifactId>cxf-tools2-common</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
@@ -81,11 +80,6 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
Modified: incubator/cxf/trunk/rt/bindings/xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/xml/pom.xml Tue Mar 13 22:21:15 2007
@@ -71,40 +71,15 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools2-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-xsd</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
- <xsdOptions>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
- <bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xjb</bindingFile>
- <deleteDirs>
- <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
- </deleteDirs>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/rt/bindings/xml</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/rt/bindings/xml</developerConnection>
Modified: incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/pom.xml Tue Mar 13 22:21:15 2007
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
+ <artifactId>cxf-tools2-common</artifactId>
<version>${project.version}</version>
</dependency>
Modified: incubator/cxf/trunk/rt/management/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/rt/management/pom.xml (original)
+++ incubator/cxf/trunk/rt/management/pom.xml Tue Mar 13 22:21:15 2007
@@ -65,6 +65,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools2-xjc-dv</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.easymock</groupId>
@@ -103,7 +109,7 @@
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-xjc-dv</artifactId>
+ <artifactId>cxf-tools2-xjc-dv</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: incubator/cxf/trunk/rt/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/rt/pom.xml (original)
+++ incubator/cxf/trunk/rt/pom.xml Tue Mar 13 22:21:15 2007
@@ -32,7 +32,6 @@
</parent>
<modules>
- <module>core</module>
<module>management</module>
<module>transports/local</module>
<module>databinding/jaxb</module>
Modified: incubator/cxf/trunk/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/http/pom.xml Tue Mar 13 22:21:15 2007
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
+ <artifactId>cxf-tools2-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -120,7 +120,7 @@
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-xjc-dv</artifactId>
+ <artifactId>cxf-tools2-xjc-dv</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: incubator/cxf/trunk/rt/transports/http2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/rt/transports/http2/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/http2/pom.xml Tue Mar 13 22:21:15 2007
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
+ <artifactId>cxf-tools2-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -127,7 +127,7 @@
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-xjc-dv</artifactId>
+ <artifactId>cxf-tools2-xjc-dv</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: incubator/cxf/trunk/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/jms/pom.xml Tue Mar 13 22:21:15 2007
@@ -91,52 +91,15 @@
<artifactId>activemq-core</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools2-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-xsd</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
- <xsdOptions>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
- <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xjb</bindingFile>
- <deleteDirs>
- <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
- </deleteDirs>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-xjc-dv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
<repositories>
<repository>
Modified: incubator/cxf/trunk/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/policy/pom.xml Tue Mar 13 22:21:15 2007
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
+ <artifactId>cxf-tools2-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: incubator/cxf/trunk/rt/ws/rm/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/rm/pom.xml Tue Mar 13 22:21:15 2007
@@ -121,7 +121,7 @@
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-xjc-dv</artifactId>
+ <artifactId>cxf-tools2-xjc-dv</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: incubator/cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Tue Mar 13 22:21:15 2007
@@ -50,27 +50,17 @@
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
+ <artifactId>cxf-tools2-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-java2wsdl</artifactId>
+ <artifactId>cxf-tools2-java2wsdl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-misctools</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-validator</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-java2wsdl</artifactId>
+ <artifactId>cxf-tools2-validator</artifactId>
<version>${project.version}</version>
</dependency>
Modified: incubator/cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/testutils/pom.xml (original)
+++ incubator/cxf/trunk/testutils/pom.xml Tue Mar 13 22:21:15 2007
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
+ <artifactId>cxf-tools2-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -162,10 +162,23 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools2-xjc-dv</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-common-utilities</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
</plugin>
<plugin>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
+ <artifactId>cxf-codegen-plugin2</artifactId>
<version>${project.version}</version>
<executions>
<execution>
@@ -186,14 +199,239 @@
<extraarg>
${basedir}/src/main/resources/wsdl/async_binding.xml
</extraarg>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPService</extraarg>
+
</extraargs>
</wsdlOption>
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-b</extraarg>
+ <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
+ </extraarg>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPProviderService</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-b</extraarg>
+ <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
+ </extraarg>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPDispatchService</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-b</extraarg>
+ <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
+ </extraarg>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPService_DocLitBare</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-b</extraarg>
+ <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
+ </extraarg>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPServiceAddressingDocLitBare</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-b</extraarg>
+ <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
+ </extraarg>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPService_Test1</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-b</extraarg>
+ <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
+ </extraarg>
+ <extraarg>-sn</extraarg>
+ <extraarg>SoapPort_Test2</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-b</extraarg>
+ <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
+ </extraarg>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPServiceAddressing</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-b</extraarg>
+ <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
+ </extraarg>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPServiceConcurrencyTest</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/hello_world_soap12.wsdl</wsdl>
</wsdlOption>
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SecureSOAPService</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SecureDontRequireClientAuthSOAPService</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>TargetSecureSOAPService</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>InterSecureSOAPService</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>TargetSecureDontRequireClientAuthSOAPService</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>InterSecureDontRequireClientAuthSOAPService</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SecureSOAPServiceServerConfiguredByGoodProvider</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SecureSOAPServiceServerConfiguredByBadProvider</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SecureSOAPServiceP12</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SecureSOAPServiceDifferentCipherSuites</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SecureSOAPServiceClientPropertiesSet</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SecureSOAPServiceClientPropertiesNotSet</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+
+
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/greeter_control.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-b</extraarg>
+ <extraarg>
+ ${basedir}/src/main/resources/wsdl/greeter_control.xjb
+ </extraarg>
+ <extraarg>-sn</extraarg>
+ <extraarg>BasicGreeterService</extraarg>
+
+ </extraargs>
+ </wsdlOption>
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/greeter_control.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-b</extraarg>
+ <extraarg>
+ ${basedir}/src/main/resources/wsdl/greeter_control.xjb
+ </extraarg>
+ <extraarg>-sn</extraarg>
+ <extraarg>ControlService</extraarg>
+
+ </extraargs>
</wsdlOption>
+
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/greeter_control.wsdl</wsdl>
<extraargs>
@@ -201,71 +439,345 @@
<extraarg>
${basedir}/src/main/resources/wsdl/greeter_control.xjb
</extraarg>
+ <extraarg>-sn</extraarg>
+ <extraarg>GreeterService</extraarg>
+
</extraargs>
</wsdlOption>
+
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/mtom_xop.wsdl</wsdl>
</wsdlOption>
+
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/swa-mime.wsdl</wsdl>
</wsdlOption>
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/hello_world_xml_mixed.wsdl</wsdl>
</wsdlOption>
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/hello_world_xml_bare.wsdl</wsdl>
</wsdlOption>
+
<wsdlOption>
<wsdl>
${basedir}/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl
</wsdl>
</wsdlOption>
+
<wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>GreeterService</extraarg>
+ </extraargs>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>GreeterService</extraarg>
+ </extraargs>
</wsdlOption>
+
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPServiceRPCLit</extraarg>
+ </extraargs>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPServiceProviderRPCLit</extraarg>
+ </extraargs>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPServiceRPCLit1</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPServiceRPCLit2</extraarg>
+ </extraargs>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPServiceRPCLit3</extraarg>
+ </extraargs>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPServiceRPCLit4</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPServiceRPCLit5</extraarg>
+ </extraargs>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPServiceRPCLit6</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/hello_world_mixedstyle.wsdl</wsdl>
</wsdlOption>
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPService</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+
+
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPService2</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPService3</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPService4</extraarg>
+ </extraargs>
</wsdlOption>
+
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPService5</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>XMLService1</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>XMLService2</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>XMLService3</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>XMLService4</extraarg>
+ </extraargs>
+ </wsdlOption>
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/doc_lit_bare.wsdl</wsdl>
</wsdlOption>
+
+
+
+ <!--wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>HelloWorldQueueBinMsgService</extraarg>
+ </extraargs>
+
+ </wsdlOption>
+
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>HelloWorldServiceLoop</extraarg>
+ </extraargs>
+
+ </wsdlOption>
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>HWStaticReplyQBinMsgService</extraarg>
+ </extraargs>
+
+ </wsdlOption>
+
+
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>HWStaticReplyQTextMsgService</extraarg>
+ </extraargs>
+
+ </wsdlOption-->
+
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>HelloWorldOneWayQueueService</extraarg>
+ </extraargs>
+
</wsdlOption>
+
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>HelloWorldPubSubService</extraarg>
+ </extraargs>
+
+ </wsdlOption>
+
+
+
+ <!--wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>JMSSOAPServiceAddressing</extraarg>
+ </extraargs>
+
+ </wsdlOption-->
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>HelloWorldService</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/handler_test.wsdl</wsdl>
</wsdlOption>
+
+
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/soapheader.wsdl</wsdl>
</wsdlOption>
+
+
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/soapheader2.wsdl</wsdl>
</wsdlOption>
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/soapheader_rpc.wsdl</wsdl>
</wsdlOption>
+
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/locator.wsdl</wsdl>
- <!--extraargs>
- <extraarg>-p</extraarg>
- <extraarg>org.apache.cxf.testutils.locator</extraarg>
- </extraargs-->
</wsdlOption>
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/schema_validation.wsdl</wsdl>
</wsdlOption>
+
+
<wsdlOption>
<wsdl>
${basedir}/src/main/resources/wsdl/anonymous_complex_type.wsdl
</wsdl>
</wsdlOption>
+
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/basic_callback_test.wsdl</wsdl>
+
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>SOAPService</extraarg>
+ </extraargs>
+
</wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/basic_callback_test.wsdl</wsdl>
+
+ <extraargs>
+ <extraarg>-sn</extraarg>
+ <extraarg>CallbackService</extraarg>
+ </extraargs>
+
+ </wsdlOption>
<wsdlOption>
<wsdl>
@@ -330,21 +842,28 @@
</dependency>
</dependencies>
</wsdlOption>
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/addNumbers.wsdl</wsdl>
</wsdlOption>
+
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/calculator.wsdl</wsdl>
</wsdlOption>
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/jaxb_element_test.wsdl</wsdl>
</wsdlOption>
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/ordered_param_holder.wsdl</wsdl>
</wsdlOption>
+
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/hello_world_services.wsdl</wsdl>
</wsdlOption>
+
</wsdlOptions>
</configuration>
<goals>
Modified: incubator/cxf/trunk/tools2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/tools2/pom.xml (original)
+++ incubator/cxf/trunk/tools2/pom.xml Tue Mar 13 22:21:15 2007
@@ -35,7 +35,6 @@
<module>common</module>
<module>validator</module>
<module>wsdlto</module>
- <module>javato</module>
<module>xjc</module>
</modules>
Modified: incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml (original)
+++ incubator/cxf/trunk/tools2/xjc/dv-test/pom.xml Tue Mar 13 22:21:15 2007
@@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-xjc-dv-test</artifactId>
+ <artifactId>cxf-tools2-xjc-dv-test</artifactId>
<packaging>jar</packaging>
<version>2.0-incubator-RC-SNAPSHOT</version>
<name>Apache CXF XJC Default Value Plugin Tests</name>
Modified: incubator/cxf/trunk/tools2/xjc/dv/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/dv/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/tools2/xjc/dv/pom.xml (original)
+++ incubator/cxf/trunk/tools2/xjc/dv/pom.xml Tue Mar 13 22:21:15 2007
@@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-xjc-dv</artifactId>
+ <artifactId>cxf-tools2-xjc-dv</artifactId>
<packaging>jar</packaging>
<version>2.0-incubator-RC-SNAPSHOT</version>
<name>Apache CXF XJC Default Value Plugin</name>
Modified: incubator/cxf/trunk/tools2/xjc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/xjc/pom.xml?view=diff&rev=518024&r1=518023&r2=518024
==============================================================================
--- incubator/cxf/trunk/tools2/xjc/pom.xml (original)
+++ incubator/cxf/trunk/tools2/xjc/pom.xml Tue Mar 13 22:21:15 2007
@@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-xjc</artifactId>
+ <artifactId>cxf-tools2-xjc</artifactId>
<packaging>pom</packaging>
<version>2.0-incubator-RC-SNAPSHOT</version>
<name>Apache CXF XJC Plugins</name>