Author: veithen
Date: Thu Sep 20 19:33:34 2012
New Revision: 1388171
URL: http://svn.apache.org/viewvc?rev=1388171&view=rev
Log:
Use a reasonable default value for the output directory used by
maven-wsdl2java-plugin.
Modified:
axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml
axis/axis1/java/trunk/integration/pom.xml
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java
axis/axis1/java/trunk/samples/echo-sample/pom.xml
axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml
axis/axis1/java/trunk/samples/mtomstub-sample/pom.xml
Modified: axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml?rev=1388171&r1=1388170&r2=1388171&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml (original)
+++ axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml Thu Sep 20
19:33:34 2012
@@ -74,7 +74,6 @@
</goals>
<configuration>
<file>src/test/wsdl/test.wsdl</file>
-
<output>${project.build.directory}/work</output>
<serverSide>true</serverSide>
<mappings>
<mapping>
@@ -129,7 +128,7 @@
<port>${testPort}</port>
<wsdds>
<wsdd>
-
<directory>${project.build.directory}/work</directory>
+
<directory>${project.build.directory}/generated-test-sources/wsdl2java</directory>
<includes>
<include>**/deploy.wsdd</include>
</includes>
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1388171&r1=1388170&r2=1388171&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Thu Sep 20 19:33:34 2012
@@ -168,9 +168,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>maven-wsdl2java-plugin</artifactId>
<version>${project.version}</version>
- <configuration>
- <output>${project.build.directory}/work</output>
- </configuration>
<executions>
<execution>
<id>samples-echo</id>
@@ -1186,7 +1183,7 @@
</includes>
</wsdd>
<wsdd>
-
<directory>${project.build.directory}/work</directory>
+
<directory>${project.build.directory}/generated-test-sources/wsdl2java</directory>
<includes>
<include>**/deploy.wsdd</include>
</includes>
@@ -1224,8 +1221,8 @@
<configuration>
<target>
<!-- TODO: quick and dirty hack to be able to
compile all tests -->
- <mkdir
dir="${project.build.directory}/work/samples/client"/>
- <copy
file="../distribution/src/main/files/samples/client/DynamicInvoker.java"
todir="${project.build.directory}/work/samples/client"/>
+ <mkdir
dir="${project.build.directory}/generated-test-sources/wsdl2java/samples/client"/>
+ <copy
file="../distribution/src/main/files/samples/client/DynamicInvoker.java"
todir="${project.build.directory}/generated-test-sources/wsdl2java/samples/client"/>
</target>
</configuration>
</execution>
Modified:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java?rev=1388171&r1=1388170&r2=1388171&view=diff
==============================================================================
---
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
(original)
+++
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
Thu Sep 20 19:33:34 2012
@@ -68,14 +68,6 @@ public abstract class AbstractWsdl2JavaM
private String url;
/**
- * Output directory for emitted files.
- *
- * @parameter
- * @required
- */
- private File output;
-
- /**
* Add scope to deploy.xml: "Application", "Request", "Session".
*
* @parameter
@@ -200,7 +192,7 @@ public abstract class AbstractWsdl2JavaM
// emitter.setProperties(properties);
// emitter.setImports(!noImports);
emitter.setAllWanted(all);
- emitter.setOutputDir(output.getAbsolutePath());
+ emitter.setOutputDir(getSourceOutputDirectory().getAbsolutePath());
emitter.setServerSide(serverSide);
emitter.setSkeletonWanted(skeleton);
// emitter.setVerbose(verbose);
@@ -255,9 +247,10 @@ public abstract class AbstractWsdl2JavaM
throw new MojoFailureException("wsdl2java failed", ex);
}
- addSourceRoot(project, output.getAbsolutePath());
+ addSourceRoot(project, getSourceOutputDirectory().getAbsolutePath());
}
+ protected abstract File getSourceOutputDirectory();
protected abstract void configureEmitter(Emitter emitter);
protected abstract void addSourceRoot(MavenProject project, String path);
}
Modified:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java?rev=1388171&r1=1388170&r2=1388171&view=diff
==============================================================================
---
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
(original)
+++
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
Thu Sep 20 19:33:34 2012
@@ -18,6 +18,8 @@
*/
package org.apache.axis.tools.maven.wsdl2java;
+import java.io.File;
+
import org.apache.axis.wsdl.toJava.Emitter;
import org.apache.maven.project.MavenProject;
@@ -28,6 +30,17 @@ import org.apache.maven.project.MavenPro
* @phase generate-sources
*/
public class GenerateSourcesMojo extends AbstractWsdl2JavaMojo {
+ /**
+ * Output directory for generated source files.
+ *
+ * @parameter
default-value="${project.build.directory}/generated-sources/wsdl2java"
+ */
+ private File sourceOutputDirectory;
+
+ protected File getSourceOutputDirectory() {
+ return sourceOutputDirectory;
+ }
+
protected void configureEmitter(Emitter emitter) {
// In a Maven build, generated sources are always written to a
directory other than
// the source directory. By default, the emitter would generate an
empty implementation
Modified:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java?rev=1388171&r1=1388170&r2=1388171&view=diff
==============================================================================
---
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java
(original)
+++
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java
Thu Sep 20 19:33:34 2012
@@ -18,6 +18,8 @@
*/
package org.apache.axis.tools.maven.wsdl2java;
+import java.io.File;
+
import org.apache.axis.wsdl.toJava.Emitter;
import org.apache.maven.project.MavenProject;
@@ -29,6 +31,17 @@ import org.apache.maven.project.MavenPro
*/
public class GenerateTestSourcesMojo extends AbstractWsdl2JavaMojo {
/**
+ * Output directory for generated source files.
+ *
+ * @parameter
default-value="${project.build.directory}/generated-test-sources/wsdl2java"
+ */
+ private File testSourceOutputDirectory;
+
+ protected File getSourceOutputDirectory() {
+ return testSourceOutputDirectory;
+ }
+
+ /**
* Flag indicating whether a default (empty) implementation should be
generated.
*
* @parameter default-value="false"
Modified: axis/axis1/java/trunk/samples/echo-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/echo-sample/pom.xml?rev=1388171&r1=1388170&r2=1388171&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/echo-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/echo-sample/pom.xml Thu Sep 20 19:33:34 2012
@@ -45,10 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>maven-wsdl2java-plugin</artifactId>
<version>${project.version}</version>
- <configuration>
- <!-- TODO: the Maven plugin should have a default here -->
- <output>${project.build.directory}/work</output>
- </configuration>
<executions>
<execution>
<id>samples-echo</id>
Modified: axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml?rev=1388171&r1=1388170&r2=1388171&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml Thu Sep 20 19:33:34 2012
@@ -67,9 +67,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>maven-wsdl2java-plugin</artifactId>
<version>${project.version}</version>
- <configuration>
- <output>${project.build.directory}/work</output>
- </configuration>
<executions>
<execution>
<id>address</id>
@@ -131,7 +128,7 @@
</includes>
</wsdd>
<wsdd>
-
<directory>${project.build.directory}/work</directory>
+
<directory>${project.build.directory}/generated-sources/wsdl2java</directory>
<includes>
<include>**/*.wsdd</include>
</includes>
Modified: axis/axis1/java/trunk/samples/mtomstub-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/mtomstub-sample/pom.xml?rev=1388171&r1=1388170&r2=1388171&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/mtomstub-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/mtomstub-sample/pom.xml Thu Sep 20 19:33:34
2012
@@ -96,9 +96,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>maven-wsdl2java-plugin</artifactId>
<version>${project.version}</version>
- <configuration>
- <output>${project.build.directory}/generated/src</output>
- </configuration>
<executions>
<execution>
<goals>
