Author: veithen
Date: Thu Sep 20 20:37:48 2012
New Revision: 1388204
URL: http://svn.apache.org/viewvc?rev=1388204&view=rev
Log:
Make the location of the generated deploy.wsdd and undeploy.wsdd files
configurable.
Added:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
(with props)
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java
(with props)
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
(with props)
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java
(with props)
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/samples/jaxrpc-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=1388204&r1=1388203&r2=1388204&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
20:37:48 2012
@@ -81,6 +81,7 @@
<package>org.apache.axis.transport.http.javanet</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/deploy.wsdd</deployWsdd>
</configuration>
</execution>
</executions>
@@ -128,9 +129,9 @@
<port>${testPort}</port>
<wsdds>
<wsdd>
-
<directory>${project.build.directory}/generated-test-sources/wsdl2java</directory>
+
<directory>${project.build.directory}</directory>
<includes>
- <include>**/deploy.wsdd</include>
+ <include>deploy.wsdd</include>
</includes>
</wsdd>
</wsdds>
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1388204&r1=1388203&r2=1388204&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Thu Sep 20 20:37:48 2012
@@ -232,6 +232,7 @@
<package>test.wsdl.import.binding2</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/_import-1.wsdd</deployWsdd>
</configuration>
</execution>
<!-- Import Test 2: all namespace->package mappings from
the -->
@@ -272,6 +273,7 @@
<package>test.import2.messages</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/_import-2.wsdd</deployWsdd>
</configuration>
</execution>
<!-- Import Test 3: all namespace->package mappings from
the -->
@@ -316,6 +318,7 @@
<package>test.wsdl.adaptive.types.internal</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/adaptive.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -337,6 +340,7 @@
<package>test.wsdl.any</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/any.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -354,6 +358,7 @@
<package>test.wsdl.anytype</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/anytype.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -372,6 +377,7 @@
<package>test.wsdl.arrays</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/arrays.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -429,6 +435,7 @@
<package>test.wsdl.arrays4</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/arrays4.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -440,6 +447,7 @@
<file>src/test/wsdl/attachments/mime.wsdl</file>
<serverSide>true</serverSide>
<skeleton>true</skeleton>
+
<deployWsdd>${project.build.directory}/wsdd/attachments.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -527,6 +535,7 @@
<package>test.wsdl.datatypes</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/datatypes.wsdd</deployWsdd>
</configuration>
</execution>
<!-- This tests Bug 9642 - Java Date not deserialize
properly. -->
@@ -538,6 +547,7 @@
<configuration>
<file>src/test/wsdl/date/testdate.wsdl</file>
<serverSide>true</serverSide>
+
<deployWsdd>${project.build.directory}/wsdd/date.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -555,6 +565,7 @@
<package>test.wsdl.document</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/document.wsdd</deployWsdd>
</configuration>
</execution>
<!-- This tests holders for complextype Bug:10247 -->
@@ -576,6 +587,7 @@
<package>test.wsdl.echo</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/echo.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -592,6 +604,7 @@
<package>test.wsdl.echo2</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/echo2.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -604,6 +617,7 @@
<serverSide>true</serverSide>
<skeleton>true</skeleton>
<helperGen>true</helperGen>
+
<deployWsdd>${project.build.directory}/wsdd/esr.wsdd</deployWsdd>
</configuration>
</execution>
<!-- extension Sample Test -->
@@ -623,6 +637,7 @@
<package>test.wsdl.extension</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/extension.wsdd</deployWsdd>
</configuration>
</execution>
<!-- WSDL fault generation test -->
@@ -640,6 +655,7 @@
<package>test.wsdl.faults</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/faults.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -657,6 +673,7 @@
<package>test.wsdl.gateway</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/gateway.wsdd</deployWsdd>
</configuration>
</execution>
<!-- This tests the getPort method in generated services.
-->
@@ -669,6 +686,7 @@
<file>src/test/wsdl/getPort/getPort.wsdl</file>
<serverSide>true</serverSide>
<implementation>true</implementation>
+
<deployWsdd>${project.build.directory}/wsdd/getPort.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -682,6 +700,7 @@
<serverSide>true</serverSide>
<skeleton>true</skeleton>
<implementation>true</implementation>
+
<deployWsdd>${project.build.directory}/wsdd/header.wsdd</deployWsdd>
</configuration>
</execution>
<!-- Include test -->
@@ -701,6 +720,7 @@
<package>test.wsdl.include</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/include.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -718,6 +738,7 @@
<package>test.wsdl.inout</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/inout.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -728,6 +749,7 @@
<configuration>
<file>src/test/wsdl/jaxrpcdynproxy/AddressInOut.wsdl</file>
<serverSide>true</serverSide>
+
<deployWsdd>${project.build.directory}/wsdd/jaxrpcdynproxy.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -745,6 +767,7 @@
<package>test.wsdl.map</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/map.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -763,6 +786,7 @@
<package>test.wsdl.marrays</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/marrays.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -775,6 +799,7 @@
<deployScope>session</deployScope>
<serverSide>true</serverSide>
<typeMappingVersion>1.3</typeMappingVersion>
+
<deployWsdd>${project.build.directory}/wsdd/marshall.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -788,6 +813,7 @@
<serverSide>true</serverSide>
<typeMappingVersion>1.3</typeMappingVersion>
<wrapArrays>true</wrapArrays>
+
<deployWsdd>${project.build.directory}/wsdd/marshall2.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -806,6 +832,7 @@
<package>test.wsdl.multiref</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/multiref.wsdd</deployWsdd>
</configuration>
</execution>
<!-- Check to make sure we map XML names that are illegal
Java correctly -->
@@ -824,6 +851,7 @@
<package>test.filegen</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/names.wsdd</deployWsdd>
</configuration>
</execution>
<!-- Nested Structure Test -->
@@ -843,6 +871,7 @@
<package>test.wsdl.nested</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/nested.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -853,6 +882,7 @@
<configuration>
<file>src/test/wsdl/omit/omit.wsdl</file>
<serverSide>true</serverSide>
+
<deployWsdd>${project.build.directory}/wsdd/omit.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -864,6 +894,7 @@
<file>src/test/wsdl/oneway/oneway.wsdl</file>
<serverSide>true</serverSide>
<implementationClassName>test.wsdl.oneway.OnewayImpl</implementationClassName>
+
<deployWsdd>${project.build.directory}/wsdd/oneway.wsdd</deployWsdd>
</configuration>
</execution>
<!-- This tests polymorphism of return values -->
@@ -881,6 +912,7 @@
<package>test.wsdl.polymorphism</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/polymorphism.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -891,6 +923,7 @@
<configuration>
<file>src/test/wsdl/primitiveWrappers/primitiveWrappers.wsdl</file>
<serverSide>true</serverSide>
+
<deployWsdd>${project.build.directory}/wsdd/primitiveWrappers.wsdd</deployWsdd>
</configuration>
</execution>
<!-- This tests element qualification. -->
@@ -908,6 +941,7 @@
<package>test.wsdl.qualify</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/qualify.wsdd</deployWsdd>
</configuration>
</execution>
<!-- test for qualified or unqualified attributes -->
@@ -925,6 +959,7 @@
<package>test.wsdl.qualify2</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/qualify2.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -945,6 +980,7 @@
<package>test.wsdl.ram</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/ram.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -957,6 +993,7 @@
<deployScope>session</deployScope>
<serverSide>true</serverSide>
<skeleton>true</skeleton>
+
<deployWsdd>${project.build.directory}/wsdd/session.wsdd</deployWsdd>
</configuration>
</execution>
<!-- This tests holders for complextype Bug:10247 -->
@@ -974,6 +1011,7 @@
<package>test.wsdl.stubheaders</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/stubheaders.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -1007,6 +1045,7 @@
<package>test.wsdl.wrapped</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/wrapped.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -1029,6 +1068,7 @@
<package>test.wsdl.wrapped2.xsd</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/wrapped2.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -1048,6 +1088,7 @@
<package>test.wsdl.wrapped_choice</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/wrapped_choice.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -1064,6 +1105,7 @@
<package>test.wsdl.wrapped_holders</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/wrapped_holders.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -1080,6 +1122,7 @@
<package>test.wsdl.wrapped_inout</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/wrapped_inout.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -1096,6 +1139,7 @@
<package>test.wsdl.wrapperHolder</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/wrapperHolder.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -1112,6 +1156,7 @@
<package>test.wsdl.wrapperHolder2</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/wrapperHolder2.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -1141,6 +1186,7 @@
<package>test.wsdl.xsd.impl</package>
</mapping>
</mappings>
+
<deployWsdd>${project.build.directory}/wsdd/xsd.wsdd</deployWsdd>
</configuration>
</execution>
</executions>
@@ -1183,12 +1229,9 @@
</includes>
</wsdd>
<wsdd>
-
<directory>${project.build.directory}/generated-test-sources/wsdl2java</directory>
- <includes>
- <include>**/deploy.wsdd</include>
- </includes>
+
<directory>${project.build.directory}/wsdd</directory>
</wsdd>
- <!-- TODO: we need to fix the deploy goal (and
also wsdl2java) so that we can specify the output location for the WSDD files
-->
+ <!-- TODO: we need to fix the deploy goal so
that we can specify the output location for the WSDD files -->
<wsdd>
<directory>${project.build.directory}/generated-sources/deploy</directory>
<includes>
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=1388204&r1=1388203&r2=1388204&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 20:37:48 2012
@@ -144,6 +144,20 @@ public abstract class AbstractWsdl2JavaM
private boolean helperGen;
/**
+ * The location of the deployment WSDD file to be generated.
+ *
+ * @parameter
+ */
+ private File deployWsdd;
+
+ /**
+ * The location of the undeployment WSDD file to be generated.
+ *
+ * @parameter
+ */
+ private File undeployWsdd;
+
+ /**
* A set of Java to XML type mappings that override the default mappings.
This can be used to
* change the Java class associated with an XML type.
*
@@ -168,7 +182,14 @@ public abstract class AbstractWsdl2JavaM
}
// Instantiate the emitter
- Emitter emitter = new Emitter();
+ EmitterEx emitter = new EmitterEx();
+ if (deployWsdd != null) {
+ emitter.setDeployWsdd(deployWsdd.getAbsolutePath());
+ }
+ if (undeployWsdd != null) {
+ emitter.setUndeployWsdd(undeployWsdd.getAbsolutePath());
+ }
+ emitter.setFactory(new JavaGeneratorFactoryEx(emitter));
//extract the scope
Scope scope = Scope.getScope(deployScope, null);
@@ -184,9 +205,6 @@ public abstract class AbstractWsdl2JavaM
}
// emitter.setTestCaseWanted(testCase);
emitter.setHelperWanted(helperGen);
-// if (factory != null) {
-// emitter.setFactory(factory);
-// }
// emitter.setNamespaceIncludes(nsIncludes);
// emitter.setNamespaceExcludes(nsExcludes);
// emitter.setProperties(properties);
Added:
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=1388204&view=auto
==============================================================================
---
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
(added)
+++
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
Thu Sep 20 20:37:48 2012
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+package org.apache.axis.tools.maven.wsdl2java;
+
+import org.apache.axis.wsdl.toJava.Emitter;
+
+public class EmitterEx extends Emitter {
+ private String deployWsdd;
+ private String undeployWsdd;
+
+ public String getDeployWsdd() {
+ return deployWsdd;
+ }
+
+ public void setDeployWsdd(String deployWsdd) {
+ this.deployWsdd = deployWsdd;
+ }
+
+ public String getUndeployWsdd() {
+ return undeployWsdd;
+ }
+
+ public void setUndeployWsdd(String undeployWsdd) {
+ this.undeployWsdd = undeployWsdd;
+ }
+}
Propchange:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java?rev=1388204&view=auto
==============================================================================
---
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java
(added)
+++
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java
Thu Sep 20 20:37:48 2012
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+package org.apache.axis.tools.maven.wsdl2java;
+
+import javax.wsdl.Definition;
+
+import org.apache.axis.wsdl.symbolTable.SymbolTable;
+import org.apache.axis.wsdl.toJava.Emitter;
+import org.apache.axis.wsdl.toJava.JavaDeployWriter;
+
+public class JavaDeployWriterEx extends JavaDeployWriter {
+ public JavaDeployWriterEx(Emitter emitter, Definition definition,
SymbolTable symbolTable) {
+ super(emitter, definition, symbolTable);
+ }
+
+ protected String getFileName() {
+ return ((EmitterEx)emitter).getDeployWsdd();
+ }
+}
Propchange:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
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=1388204&view=auto
==============================================================================
---
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
(added)
+++
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
Thu Sep 20 20:37:48 2012
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+package org.apache.axis.tools.maven.wsdl2java;
+
+import javax.wsdl.Definition;
+
+import org.apache.axis.wsdl.toJava.Emitter;
+import org.apache.axis.wsdl.toJava.JavaDefinitionWriter;
+import org.apache.axis.wsdl.toJava.JavaGeneratorFactory;
+
+public class JavaGeneratorFactoryEx extends JavaGeneratorFactory {
+ public JavaGeneratorFactoryEx(Emitter emitter) {
+ super(emitter);
+ }
+
+ protected void addDefinitionGenerators() {
+ addGenerator(Definition.class, JavaDefinitionWriter.class);
+ if (((EmitterEx)emitter).getDeployWsdd() != null) {
+ addGenerator(Definition.class, JavaDeployWriterEx.class);
+ }
+ if (((EmitterEx)emitter).getUndeployWsdd() != null) {
+ addGenerator(Definition.class, JavaUndeployWriterEx.class);
+ }
+ }
+}
Propchange:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java?rev=1388204&view=auto
==============================================================================
---
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java
(added)
+++
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java
Thu Sep 20 20:37:48 2012
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+package org.apache.axis.tools.maven.wsdl2java;
+
+import javax.wsdl.Definition;
+
+import org.apache.axis.wsdl.symbolTable.SymbolTable;
+import org.apache.axis.wsdl.toJava.Emitter;
+import org.apache.axis.wsdl.toJava.JavaUndeployWriter;
+
+public class JavaUndeployWriterEx extends JavaUndeployWriter {
+ public JavaUndeployWriterEx(Emitter emitter, Definition definition,
SymbolTable notUsed) {
+ super(emitter, definition, notUsed);
+ }
+
+ protected String getFileName() {
+ return ((EmitterEx)emitter).getUndeployWsdd();
+ }
+}
Propchange:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java
------------------------------------------------------------------------------
svn:eol-style = native
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=1388204&r1=1388203&r2=1388204&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml Thu Sep 20 20:37:48 2012
@@ -76,6 +76,7 @@
<configuration>
<file>src/main/wsdl/address/Address.wsdl</file>
<serverSide>true</serverSide>
+
<deployWsdd>${project.build.directory}/wsdd/address.wsdd</deployWsdd>
</configuration>
</execution>
<execution>
@@ -86,6 +87,7 @@
<configuration>
<file>src/main/wsdl/hello/HelloWorld.wsdl</file>
<serverSide>true</serverSide>
+
<deployWsdd>${project.build.directory}/wsdd/hello.wsdd</deployWsdd>
</configuration>
</execution>
</executions>
@@ -128,10 +130,7 @@
</includes>
</wsdd>
<wsdd>
-
<directory>${project.build.directory}/generated-sources/wsdl2java</directory>
- <includes>
- <include>**/*.wsdd</include>
- </includes>
+
<directory>${project.build.directory}/wsdd</directory>
</wsdd>
</wsdds>
</configuration>
