Author: veithen
Date: Fri Sep 21 20:35:40 2012
New Revision: 1388670
URL: http://svn.apache.org/viewvc?rev=1388670&view=rev
Log:
Make generation of client stubs optional in 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/EmitterEx.java
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.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=1388670&r1=1388669&r2=1388670&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 Fri Sep 21
20:35:40 2012
@@ -74,7 +74,7 @@
</goals>
<configuration>
<file>src/test/wsdl/test.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>http://www.example.org/test/</namespace>
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1388670&r1=1388669&r2=1388670&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Fri Sep 21 20:35:40 2012
@@ -176,6 +176,7 @@
</goals>
<configuration>
<file>../samples/echo-sample/src/main/wsdl/InteropTest.wsdl</file>
+ <generate>client</generate>
<typeMappingVersion>1.1</typeMappingVersion>
<mappings>
<mapping>
@@ -196,6 +197,7 @@
</goals>
<configuration>
<file>../distribution/src/main/files/samples/addr/AddressBook.wsdl</file>
+ <generate>client</generate>
<typeMappingVersion>1.1</typeMappingVersion>
<mappings>
<mapping>
@@ -215,7 +217,7 @@
</goals>
<configuration>
<file>src/test/wsdl/_import/Import.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<implementation>true</implementation>
<mappings>
@@ -244,7 +246,7 @@
</goals>
<configuration>
<file>src/test/wsdl/_import/Import.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<implementation>true</implementation>
<mappings>
@@ -287,6 +289,7 @@
</goals>
<configuration>
<file>src/test/wsdl/_import/ImportMessagesXSDImport.wsdl</file>
+ <generate>client</generate>
<mappings>
<mapping>
<namespace>urn:types.import.test</namespace>
@@ -303,7 +306,7 @@
</goals>
<configuration>
<file>src/test/wsdl/adaptive/adaptive.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>http://com.test/wsdl/Adaptive</namespace>
@@ -329,7 +332,7 @@
<configuration>
<file>src/test/wsdl/any/any.wsdl</file>
<all>true</all>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>urn:partner.soap.sforce.com</namespace>
@@ -351,7 +354,7 @@
<configuration>
<file>${project.build.directory}/work/test/wsdl/anytype/AnyService.wsdl</file>
<all>true</all>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>http://test.com/AnyService</namespace>
@@ -369,7 +372,7 @@
<configuration>
<file>src/test/wsdl/arrays/ArrayTest.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<mappings>
<mapping>
@@ -387,7 +390,7 @@
</goals>
<configuration>
<file>src/test/wsdl/arrays2/arraytest.wsdl</file>
- <deployScope>session</deployScope>
+ <generate>client</generate>
<mappings>
<mapping>
<namespace>http://www.xyz.net/webservices/arraytest/1.0</namespace>
@@ -411,6 +414,7 @@
</goals>
<configuration>
<file>${project.build.directory}/work/test/wsdl/arrays3/generated/arrays3.wsdl</file>
+ <generate>client</generate>
<mappings>
<mapping>
<namespace>http://arrays3.test</namespace>
@@ -427,7 +431,7 @@
<configuration>
<file>src/test/wsdl/arrays4/ArrayTest.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<mappings>
<mapping>
@@ -445,7 +449,7 @@
</goals>
<configuration>
<file>src/test/wsdl/attachments/mime.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<deployWsdd>${project.build.directory}/wsdd/attachments.wsdd</deployWsdd>
</configuration>
@@ -457,6 +461,7 @@
</goals>
<configuration>
<file>src/test/wsdl/attrGroup/AttrGroupService.wsdl</file>
+ <generate>client</generate>
<mappings>
<mapping>
<namespace>http://tempuri.org/</namespace>
@@ -472,6 +477,7 @@
</goals>
<configuration>
<file>src/test/wsdl/axis2098/helloworld.wsdl</file>
+ <generate>client</generate>
<all>true</all>
<mappings>
<mapping>
@@ -492,6 +498,7 @@
</goals>
<configuration>
<file>src/test/wsdl/choice/ChoiceService.wsdl</file>
+ <generate>client</generate>
<noWrapped>true</noWrapped>
<mappings>
<mapping>
@@ -509,6 +516,7 @@
</goals>
<configuration>
<file>src/test/wsdl/dataset/DataService.wsdl</file>
+ <generate>client</generate>
<mappings>
<mapping>
<namespace>http://tempuri.org/</namespace>
@@ -526,7 +534,7 @@
<configuration>
<file>src/test/wsdl/datatypes/DataTypes.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<wrapArrays>true</wrapArrays>
<mappings>
@@ -546,7 +554,7 @@
</goals>
<configuration>
<file>src/test/wsdl/date/testdate.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<deployWsdd>${project.build.directory}/wsdd/date.wsdd</deployWsdd>
</configuration>
</execution>
@@ -558,7 +566,7 @@
<configuration>
<file>${project.build.directory}/work/test/wsdl/document/document.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>http://document.wsdl.test</namespace>
@@ -576,7 +584,7 @@
</goals>
<configuration>
<file>src/test/wsdl/echo/echo.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>http://echo.services</namespace>
@@ -597,7 +605,7 @@
</goals>
<configuration>
<file>src/test/wsdl/echo2/echo2.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>urn:echo2.wsdl.test</namespace>
@@ -614,7 +622,7 @@
</goals>
<configuration>
<file>src/test/wsdl/esr/esr.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<helperGen>true</helperGen>
<deployWsdd>${project.build.directory}/wsdd/esr.wsdd</deployWsdd>
@@ -629,7 +637,7 @@
<configuration>
<file>src/test/wsdl/extension/extension.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<mappings>
<mapping>
@@ -648,7 +656,7 @@
</goals>
<configuration>
<file>src/test/wsdl/faults/FaultService.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>http://test.com/wsdl/faults</namespace>
@@ -665,7 +673,7 @@
</goals>
<configuration>
<file>${project.build.directory}/work/test/wsdl/gateway/Gateway.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<all>true</all>
<mappings>
<mapping>
@@ -684,7 +692,7 @@
</goals>
<configuration>
<file>src/test/wsdl/getPort/getPort.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<implementation>true</implementation>
<deployWsdd>${project.build.directory}/wsdd/getPort.wsdd</deployWsdd>
</configuration>
@@ -697,7 +705,7 @@
<configuration>
<file>src/test/wsdl/header/header.wsdl</file>
<deployScope>none</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<implementation>true</implementation>
<deployWsdd>${project.build.directory}/wsdd/header.wsdd</deployWsdd>
@@ -711,7 +719,7 @@
</goals>
<configuration>
<file>src/test/wsdl/include/AddressBook.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<implementation>true</implementation>
<mappings>
@@ -730,7 +738,7 @@
</goals>
<configuration>
<file>src/test/wsdl/inout/inout.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<mappings>
<mapping>
@@ -748,7 +756,7 @@
</goals>
<configuration>
<file>src/test/wsdl/jaxrpcdynproxy/AddressInOut.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>server</generate>
<deployWsdd>${project.build.directory}/wsdd/jaxrpcdynproxy.wsdd</deployWsdd>
</configuration>
</execution>
@@ -760,7 +768,7 @@
<configuration>
<file>${project.build.directory}/work/test/wsdl/map/MapService.wsdl</file>
<all>true</all>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>http://test.com/MapService</namespace>
@@ -778,7 +786,7 @@
<configuration>
<file>src/test/wsdl/marrays/MArrayTest.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<mappings>
<mapping>
@@ -797,7 +805,7 @@
<configuration>
<file>src/test/wsdl/marshall/marshall.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<typeMappingVersion>1.3</typeMappingVersion>
<deployWsdd>${project.build.directory}/wsdd/marshall.wsdd</deployWsdd>
</configuration>
@@ -810,7 +818,7 @@
<configuration>
<file>src/test/wsdl/marshall2/marshall2.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<typeMappingVersion>1.3</typeMappingVersion>
<wrapArrays>true</wrapArrays>
<deployWsdd>${project.build.directory}/wsdd/marshall2.wsdd</deployWsdd>
@@ -824,7 +832,7 @@
<configuration>
<file>src/test/wsdl/multiref/MultiRefTest.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<mappings>
<mapping>
@@ -843,7 +851,7 @@
</goals>
<configuration>
<file>src/test/wsdl/names/JavaNames.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<implementation>true</implementation>
<mappings>
<mapping>
@@ -863,7 +871,7 @@
<configuration>
<file>src/test/wsdl/nested/Nested.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<mappings>
<mapping>
@@ -881,7 +889,7 @@
</goals>
<configuration>
<file>src/test/wsdl/omit/omit.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<deployWsdd>${project.build.directory}/wsdd/omit.wsdd</deployWsdd>
</configuration>
</execution>
@@ -892,7 +900,7 @@
</goals>
<configuration>
<file>src/test/wsdl/oneway/oneway.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<implementationClassName>test.wsdl.oneway.OnewayImpl</implementationClassName>
<deployWsdd>${project.build.directory}/wsdd/oneway.wsdd</deployWsdd>
</configuration>
@@ -905,7 +913,7 @@
</goals>
<configuration>
<file>src/test/wsdl/polymorphism/polymorphism.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>http://xml.apache.org/axis/PolymorphismTest</namespace>
@@ -922,7 +930,7 @@
</goals>
<configuration>
<file>src/test/wsdl/primitiveWrappers/primitiveWrappers.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<deployWsdd>${project.build.directory}/wsdd/primitiveWrappers.wsdd</deployWsdd>
</configuration>
</execution>
@@ -934,7 +942,7 @@
</goals>
<configuration>
<file>src/test/wsdl/qualify/qualifytest.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>urn:qualifyTest</namespace>
@@ -952,7 +960,7 @@
</goals>
<configuration>
<file>src/test/wsdl/qualify2/attribute-qualify.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>urn:attributeQualify</namespace>
@@ -969,7 +977,7 @@
</goals>
<configuration>
<file>src/test/wsdl/ram/ram.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>urn:ram</namespace>
@@ -991,7 +999,7 @@
<configuration>
<file>src/test/wsdl/session/session.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<deployWsdd>${project.build.directory}/wsdd/session.wsdd</deployWsdd>
</configuration>
@@ -1004,7 +1012,7 @@
</goals>
<configuration>
<file>src/test/wsdl/stubheaders/stubheaders.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>http://echo.services</namespace>
@@ -1021,6 +1029,7 @@
</goals>
<configuration>
<file>src/test/wsdl/union/UnionService.wsdl</file>
+ <generate>client</generate>
<mappings>
<mapping>
<namespace>http://tempuri.org/</namespace>
@@ -1037,7 +1046,7 @@
<configuration>
<file>src/test/wsdl/wrapped/CityBBB.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<mappings>
<mapping>
@@ -1056,7 +1065,7 @@
<configuration>
<file>src/test/wsdl/wrapped2/employee.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<mappings>
<mapping>
@@ -1079,7 +1088,7 @@
<configuration>
<file>src/test/wsdl/wrapped_choice/reportservice.wsdl</file>
<deployScope>session</deployScope>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<skeleton>true</skeleton>
<implementation>true</implementation>
<mappings>
@@ -1098,7 +1107,7 @@
</goals>
<configuration>
<file>src/test/wsdl/wrapped_holders/thing.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>urn:Thing</namespace>
@@ -1115,7 +1124,7 @@
</goals>
<configuration>
<file>src/test/wsdl/wrapped_inout/wrapped_inout.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>http://tempuri.org/</namespace>
@@ -1132,7 +1141,7 @@
</goals>
<configuration>
<file>src/test/wsdl/wrapperHolder/bug1191.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>urn:wrapperHolder</namespace>
@@ -1149,7 +1158,7 @@
</goals>
<configuration>
<file>src/test/wsdl/wrapperHolder2/bug2102.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<mappings>
<mapping>
<namespace>urn:wrapperHolder2</namespace>
@@ -1166,7 +1175,7 @@
</goals>
<configuration>
<file>src/test/wsdl/xsd/good.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>both</generate>
<implementation>true</implementation>
<mappings>
<mapping>
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=1388670&r1=1388669&r2=1388670&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
Fri Sep 21 20:35:40 2012
@@ -22,6 +22,7 @@ import java.io.File;
import java.net.MalformedURLException;
import javax.xml.namespace.QName;
+import javax.xml.rpc.ServiceFactory;
import org.apache.axis.constants.Scope;
import org.apache.axis.tools.maven.shared.nsmap.Mapping;
@@ -89,16 +90,32 @@ public abstract class AbstractWsdl2JavaM
private String typeMappingVersion;
/**
- * emit server-side bindings for web service; default=false
+ * <p>
+ * Specifies what artifacts should be generated. Valid values are:
+ * <ul>
+ * <li><code>client</code>: generate client stubs
+ * <li><code>server</code>: generate server side artifacts
+ * <li><code>both</code>: generate all artifacts
+ * </ul>
+ * <p>
+ * The <code>server</code> mode can also be used for clients that rely on
dynamic proxies
+ * created using the JAX-RPC {@link ServiceFactory} API, because they
don't need client stubs.
+ * <p>
+ * Also note that the <code>both</code> mode is only really meaningful if
{@link #skeleton} is
+ * set to <code>true</code> or if {@link #deployWsdd} is specified. If
none of these conditions
+ * is satisfied, then <code>client</code> and <code>both</code> will
generate the same set of
+ * artifacts.
*
- * @parameter default-value="false"
+ * @parameter
+ * @required
*/
- private boolean serverSide;
+ private String generate;
/**
* Set the name of the class implementing the web service.
* This is especially useful when exporting a java class
* as a web service using Java2WSDL followed by WSDL2Java.
+ * This parameter is ignored if {@link #generate} is set to
<code>client</code>.
*
* @parameter
*/
@@ -106,7 +123,8 @@ public abstract class AbstractWsdl2JavaM
/**
* deploy skeleton (true) or implementation (false) in deploy.wsdd.
- * Default is false. Assumes server-side="true".
+ * Default is false. This parameter is ignored if {@link #generate} is set
to
+ * <code>client</code>.
*
* @parameter default-value="false"
*/
@@ -143,14 +161,19 @@ public abstract class AbstractWsdl2JavaM
private boolean helperGen;
/**
- * The location of the deployment WSDD file to be generated.
+ * The location of the deployment WSDD file to be generated. This
parameter is ignored if
+ * {@link #generate} is set to <code>client</code>. If this parameter is
not specified, then no
+ * deployment WSDD will be generated.
*
* @parameter
*/
private File deployWsdd;
/**
- * The location of the undeployment WSDD file to be generated.
+ * The location of the undeployment WSDD file to be generated. This
parameter is ignored if
+ * {@link #generate} is set to <code>client</code>. If this parameter is
not specified, then no
+ * undeployment WSDD will be generated. Note that (in contrast to {@link
#deployWsdd}) this
+ * parameter is rarely used: in general, no undeployment WSDD is required.
*
* @parameter
*/
@@ -182,6 +205,18 @@ public abstract class AbstractWsdl2JavaM
// Instantiate the emitter
EmitterEx emitter = new EmitterEx();
+ if (generate.equals("client")) {
+ emitter.setClientSide(true);
+ emitter.setServerSide(false);
+ } else if (generate.equals("server")) {
+ emitter.setClientSide(false);
+ emitter.setServerSide(true);
+ } else if (generate.equals("both")) {
+ emitter.setClientSide(true);
+ emitter.setServerSide(true);
+ } else {
+ throw new MojoExecutionException("Invalid value '" + generate + "'
for the 'generate' parameter");
+ }
if (deployWsdd != null) {
emitter.setDeployWsdd(deployWsdd.getAbsolutePath());
}
@@ -210,7 +245,6 @@ public abstract class AbstractWsdl2JavaM
// emitter.setImports(!noImports);
emitter.setAllWanted(all);
emitter.setOutputDir(getSourceOutputDirectory().getAbsolutePath());
- emitter.setServerSide(serverSide);
emitter.setSkeletonWanted(skeleton);
// emitter.setVerbose(verbose);
// emitter.setDebug(debug);
Modified:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java?rev=1388670&r1=1388669&r2=1388670&view=diff
==============================================================================
---
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
(original)
+++
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
Fri Sep 21 20:35:40 2012
@@ -21,10 +21,19 @@ package org.apache.axis.tools.maven.wsdl
import org.apache.axis.wsdl.toJava.Emitter;
public class EmitterEx extends Emitter {
+ private boolean clientSide;
private boolean generateImplementation;
private String deployWsdd;
private String undeployWsdd;
+ public boolean isClientSide() {
+ return clientSide;
+ }
+
+ public void setClientSide(boolean clientSide) {
+ this.clientSide = clientSide;
+ }
+
public boolean isGenerateImplementation() {
return generateImplementation;
}
Modified:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java?rev=1388670&r1=1388669&r2=1388670&view=diff
==============================================================================
---
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java
(original)
+++
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java
Fri Sep 21 20:35:40 2012
@@ -32,6 +32,14 @@ public class JavaBindingWriterEx extends
super(emitter, binding, symbolTable);
}
+ protected Generator getJavaStubWriter(Emitter emitter, BindingEntry
bEntry, SymbolTable st) {
+ if (((EmitterEx)emitter).isClientSide()) {
+ return super.getJavaStubWriter(emitter, bEntry, st);
+ } else {
+ return new NoopGenerator();
+ }
+ }
+
protected Generator getJavaImplWriter(Emitter emitter, BindingEntry
bEntry, SymbolTable st) {
if (((EmitterEx)emitter).isGenerateImplementation()) {
return super.getJavaImplWriter(emitter, bEntry, st);
Modified:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java?rev=1388670&r1=1388669&r2=1388670&view=diff
==============================================================================
---
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
(original)
+++
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
Fri Sep 21 20:35:40 2012
@@ -20,13 +20,13 @@ package org.apache.axis.tools.maven.wsdl
import javax.wsdl.Binding;
import javax.wsdl.Definition;
+import javax.wsdl.Service;
import org.apache.axis.wsdl.gen.Generator;
import org.apache.axis.wsdl.gen.NoopGenerator;
import org.apache.axis.wsdl.symbolTable.BindingEntry;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import org.apache.axis.wsdl.toJava.Emitter;
-import org.apache.axis.wsdl.toJava.JavaBindingWriter;
import org.apache.axis.wsdl.toJava.JavaDefinitionWriter;
import org.apache.axis.wsdl.toJava.JavaGeneratorFactory;
@@ -45,6 +45,14 @@ public class JavaGeneratorFactoryEx exte
}
}
+ public Generator getGenerator(Service service, SymbolTable symbolTable) {
+ if (((EmitterEx)emitter).isClientSide()) {
+ return super.getGenerator(service, symbolTable);
+ } else {
+ return new NoopGenerator();
+ }
+ }
+
public Generator getGenerator(Binding binding, SymbolTable symbolTable) {
if (include(binding.getQName())) {
Generator writer = new JavaBindingWriterEx(emitter, binding,
symbolTable);
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=1388670&r1=1388669&r2=1388670&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/echo-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/echo-sample/pom.xml Fri Sep 21 20:35:40 2012
@@ -53,6 +53,7 @@
</goals>
<configuration>
<file>src/main/wsdl/InteropTest.wsdl</file>
+ <generate>both</generate>
<typeMappingVersion>1.1</typeMappingVersion>
<mappings>
<mapping>
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=1388670&r1=1388669&r2=1388670&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml Fri Sep 21 20:35:40 2012
@@ -75,7 +75,7 @@
</goals>
<configuration>
<file>src/main/wsdl/address/Address.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>server</generate>
<deployWsdd>${project.build.directory}/wsdd/address.wsdd</deployWsdd>
</configuration>
</execution>
@@ -86,7 +86,7 @@
</goals>
<configuration>
<file>src/main/wsdl/hello/HelloWorld.wsdl</file>
- <serverSide>true</serverSide>
+ <generate>server</generate>
<deployWsdd>${project.build.directory}/wsdd/hello.wsdd</deployWsdd>
</configuration>
</execution>
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=1388670&r1=1388669&r2=1388670&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/mtomstub-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/mtomstub-sample/pom.xml Fri Sep 21 20:35:40
2012
@@ -103,6 +103,7 @@
</goals>
<configuration>
<file>${project.build.directory}/generated/wsdl/DownloadFile.wsdl</file>
+ <generate>client</generate>
<mappings>
<mapping>
<namespace>http://service.mtomstub.samples/</namespace>
