Skip to content

Commit d29b73b

Browse files
veithenveithen
committed
Use a reasonable default value for the output directory used by maven-wsdl2java-plugin.
1 parent 25c195e commit d29b73b

8 files changed

Lines changed: 34 additions & 29 deletions

File tree

‎axis-rt-transports-http-javanet/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
</goals>
7575
<configuration>
7676
<file>src/test/wsdl/test.wsdl</file>
77-
<output>${project.build.directory}/work</output>
7877
<serverSide>true</serverSide>
7978
<mappings>
8079
<mapping>
@@ -129,7 +128,7 @@
129128
<port>${testPort}</port>
130129
<wsdds>
131130
<wsdd>
132-
<directory>${project.build.directory}/work</directory>
131+
<directory>${project.build.directory}/generated-test-sources/wsdl2java</directory>
133132
<includes>
134133
<include>**/deploy.wsdd</include>
135134
</includes>

‎integration/pom.xml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,6 @@
168168
<groupId>${project.groupId}</groupId>
169169
<artifactId>maven-wsdl2java-plugin</artifactId>
170170
<version>${project.version}</version>
171-
<configuration>
172-
<output>${project.build.directory}/work</output>
173-
</configuration>
174171
<executions>
175172
<execution>
176173
<id>samples-echo</id>
@@ -1186,7 +1183,7 @@
11861183
</includes>
11871184
</wsdd>
11881185
<wsdd>
1189-
<directory>${project.build.directory}/work</directory>
1186+
<directory>${project.build.directory}/generated-test-sources/wsdl2java</directory>
11901187
<includes>
11911188
<include>**/deploy.wsdd</include>
11921189
</includes>
@@ -1224,8 +1221,8 @@
12241221
<configuration>
12251222
<target>
12261223
<!-- TODO: quick and dirty hack to be able to compile all tests -->
1227-
<mkdir dir="${project.build.directory}/work/samples/client"/>
1228-
<copy file="../distribution/src/main/files/samples/client/DynamicInvoker.java" todir="${project.build.directory}/work/samples/client"/>
1224+
<mkdir dir="${project.build.directory}/generated-test-sources/wsdl2java/samples/client"/>
1225+
<copy file="../distribution/src/main/files/samples/client/DynamicInvoker.java" todir="${project.build.directory}/generated-test-sources/wsdl2java/samples/client"/>
12291226
</target>
12301227
</configuration>
12311228
</execution>

‎maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@ public abstract class AbstractWsdl2JavaMojo extends AbstractMojo {
6767
*/
6868
private String url;
6969

70-
/**
71-
* Output directory for emitted files.
72-
*
73-
* @parameter
74-
* @required
75-
*/
76-
private File output;
77-
7870
/**
7971
* Add scope to deploy.xml: "Application", "Request", "Session".
8072
*
@@ -200,7 +192,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
200192
// emitter.setProperties(properties);
201193
// emitter.setImports(!noImports);
202194
emitter.setAllWanted(all);
203-
emitter.setOutputDir(output.getAbsolutePath());
195+
emitter.setOutputDir(getSourceOutputDirectory().getAbsolutePath());
204196
emitter.setServerSide(serverSide);
205197
emitter.setSkeletonWanted(skeleton);
206198
// emitter.setVerbose(verbose);
@@ -255,9 +247,10 @@ public void execute() throws MojoExecutionException, MojoFailureException {
255247
throw new MojoFailureException("wsdl2java failed", ex);
256248
}
257249

258-
addSourceRoot(project, output.getAbsolutePath());
250+
addSourceRoot(project, getSourceOutputDirectory().getAbsolutePath());
259251
}
260252

253+
protected abstract File getSourceOutputDirectory();
261254
protected abstract void configureEmitter(Emitter emitter);
262255
protected abstract void addSourceRoot(MavenProject project, String path);
263256
}

‎maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*/
1919
package org.apache.axis.tools.maven.wsdl2java;
2020

21+
import java.io.File;
22+
2123
import org.apache.axis.wsdl.toJava.Emitter;
2224
import org.apache.maven.project.MavenProject;
2325

@@ -28,6 +30,17 @@
2830
* @phase generate-sources
2931
*/
3032
public class GenerateSourcesMojo extends AbstractWsdl2JavaMojo {
33+
/**
34+
* Output directory for generated source files.
35+
*
36+
* @parameter default-value="${project.build.directory}/generated-sources/wsdl2java"
37+
*/
38+
private File sourceOutputDirectory;
39+
40+
protected File getSourceOutputDirectory() {
41+
return sourceOutputDirectory;
42+
}
43+
3144
protected void configureEmitter(Emitter emitter) {
3245
// In a Maven build, generated sources are always written to a directory other than
3346
// the source directory. By default, the emitter would generate an empty implementation

‎maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*/
1919
package org.apache.axis.tools.maven.wsdl2java;
2020

21+
import java.io.File;
22+
2123
import org.apache.axis.wsdl.toJava.Emitter;
2224
import org.apache.maven.project.MavenProject;
2325

@@ -28,6 +30,17 @@
2830
* @phase generate-test-sources
2931
*/
3032
public class GenerateTestSourcesMojo extends AbstractWsdl2JavaMojo {
33+
/**
34+
* Output directory for generated source files.
35+
*
36+
* @parameter default-value="${project.build.directory}/generated-test-sources/wsdl2java"
37+
*/
38+
private File testSourceOutputDirectory;
39+
40+
protected File getSourceOutputDirectory() {
41+
return testSourceOutputDirectory;
42+
}
43+
3144
/**
3245
* Flag indicating whether a default (empty) implementation should be generated.
3346
*

‎samples/echo-sample/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545
<groupId>${project.groupId}</groupId>
4646
<artifactId>maven-wsdl2java-plugin</artifactId>
4747
<version>${project.version}</version>
48-
<configuration>
49-
<!-- TODO: the Maven plugin should have a default here -->
50-
<output>${project.build.directory}/work</output>
51-
</configuration>
5248
<executions>
5349
<execution>
5450
<id>samples-echo</id>

‎samples/jaxrpc-sample/pom.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@
6767
<groupId>${project.groupId}</groupId>
6868
<artifactId>maven-wsdl2java-plugin</artifactId>
6969
<version>${project.version}</version>
70-
<configuration>
71-
<output>${project.build.directory}/work</output>
72-
</configuration>
7370
<executions>
7471
<execution>
7572
<id>address</id>
@@ -131,7 +128,7 @@
131128
</includes>
132129
</wsdd>
133130
<wsdd>
134-
<directory>${project.build.directory}/work</directory>
131+
<directory>${project.build.directory}/generated-sources/wsdl2java</directory>
135132
<includes>
136133
<include>**/*.wsdd</include>
137134
</includes>

‎samples/mtomstub-sample/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,6 @@
9696
<groupId>${project.groupId}</groupId>
9797
<artifactId>maven-wsdl2java-plugin</artifactId>
9898
<version>${project.version}</version>
99-
<configuration>
100-
<output>${project.build.directory}/generated/src</output>
101-
</configuration>
10299
<executions>
103100
<execution>
104101
<goals>

0 commit comments

Comments
 (0)