svn commit: r1388350 - /axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Author: amilas
Date: Fri Sep 21 07:02:18 2012
New Revision: 1388350
URL: http://svn.apache.org/viewvc?rev=1388350&view=rev
Log:
remove unnecessary system out
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=1388350&r1=1388349&r2=1388350&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Fri Sep 21 07:02:18 2012
@@ -638,11 +638,7 @@ public class SchemaCompiler {
SchemaCompilerMessages.getMessage("schema.elementNull"));
}
-if (xsElt.getName().equals("getUserClaimValuesResponse")){
-System.out.println("Found");
-}
-
-
+
//The processing element logic seems to be quite simple. Look at the
relevant schema type
//for each and every element and process that accordingly.
//this means that any unused type definitions would not be generated!
svn commit: r1388600 - in /axis/axis1/java/trunk/integration: ./ src/main/java/test/wsdl/anytype/ src/main/java/test/wsdl/anytype/org/ src/main/java/test/wsdl/document/ src/main/java/test/wsdl/documen
Author: veithen
Date: Fri Sep 21 18:20:41 2012
New Revision: 1388600
URL: http://svn.apache.org/viewvc?rev=1388600&view=rev
Log:
Avoid collisions between the classes passed to java2wsdl and the classes
generated later by wsdl2java.
Added:
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/org/
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/org/AnyService.java
- copied, changed from r1388090,
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/AnyService.java
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/org/
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/org/TestService.java
- copied, changed from r1388090,
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/TestService.java
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/Gateway.java
- copied, changed from r1388090,
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/Gateway.java
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/MyClass.java
- copied, changed from r1388090,
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/MyClass.java
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/OutClass.java
- copied, changed from r1388090,
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/OutClass.java
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/org/
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/org/MapService.java
- copied, changed from r1388090,
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/MapService.java
Removed:
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/AnyService.java
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/TestService.java
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/Gateway.java
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/MyClass.java
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/OutClass.java
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/MapService.java
Modified:
axis/axis1/java/trunk/integration/pom.xml
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1388600&r1=1388599&r2=1388600&view=diff
==
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Fri Sep 21 18:20:41 2012
@@ -70,12 +70,12 @@
process-classes
${project.build.directory}/work/test/wsdl/anytype/AnyService.wsdl
-test.wsdl.anytype.AnyService
+
test.wsdl.anytype.org.AnyService
http://test.com/AnyService
http://localhost:8080/axis/services/AnyService
-test.wsdl.anytype
+test.wsdl.anytype.org
http://test.com/AnyService
@@ -109,12 +109,12 @@
process-classes
${project.build.directory}/work/test/wsdl/document/document.wsdl
-
test.wsdl.document.TestService
+
test.wsdl.document.org.TestService
http://document.wsdl.test
http://localhost:8080/axis/services/DocumentTest
-test.wsdl.document
+test.wsdl.document.org
http://document.wsdl.test
@@ -128,16 +128,16 @@
process-classes
${project.build.directory}/work/test/wsdl/gateway/Gateway.wsdl
-test.wsdl.gateway.Gateway
+
test.wsdl.gateway.org.Gateway
-
test.wsdl.gateway.MyClass
-
test.wsdl.gateway.OutClass
+
test.wsdl.gateway.org.MyClass
+
test.wsdl.gateway.org.OutClass
http://test.com/gateway
http://localhost:8080/axis/services/Gateway
svn commit: r1388616 - in /axis/axis1/java/trunk: axis/src/main/java/org/apache/axis/wsdl/toJava/ maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/
Author: veithen
Date: Fri Sep 21 18:55:27 2012
New Revision: 1388616
URL: http://svn.apache.org/viewvc?rev=1388616&view=rev
Log:
Reverted the change introduced in the Emitter in r1226504 and instead integrate
it into our Maven specific customization.
Added:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java
(with props)
Modified:
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/wsdl/toJava/Emitter.java
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/wsdl/toJava/JavaBindingWriter.java
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/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/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
Modified:
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/wsdl/toJava/Emitter.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/wsdl/toJava/Emitter.java?rev=1388616&r1=1388615&r2=1388616&view=diff
==
---
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/wsdl/toJava/Emitter.java
(original)
+++
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/wsdl/toJava/Emitter.java
Fri Sep 21 18:55:27 2012
@@ -76,8 +76,6 @@ public class Emitter extends Parser {
/** Field bDeploySkeleton */
private boolean bDeploySkeleton = false;
-private boolean bImplementationWanted = true;
-
/** Field bEmitTestCase */
private boolean bEmitTestCase = false;
@@ -198,24 +196,6 @@ public class Emitter extends Parser {
}// isSkeletonWanted
/**
- * Turn on/off generation of (empty) implementation classes. Defaults to
true.
- *
- * @param value
- */
-public void setImplementationWanted(boolean value) {
-bImplementationWanted = value;
-}
-
-/**
- * Indicate if we should be generating implementation classes.
- *
- * @return
- */
-public boolean isImplementationWanted() {
-return bImplementationWanted;
-}
-
-/**
* Turn on/off Helper class generation
*
* @param value
Modified:
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/wsdl/toJava/JavaBindingWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/wsdl/toJava/JavaBindingWriter.java?rev=1388616&r1=1388615&r2=1388616&view=diff
==
---
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/wsdl/toJava/JavaBindingWriter.java
(original)
+++
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/wsdl/toJava/JavaBindingWriter.java
Fri Sep 21 18:55:27 2012
@@ -188,32 +188,30 @@ public class JavaBindingWriter implement
symbolTable);
}
-if (emitter.isImplementationWanted()) {
-// Use custom implementation classname if available
-String fileName = emitter.getImplementationClassName();
-if ( fileName == null)
- fileName =
Utils.getJavaLocalName(bEntry.getName())
- + "Impl.java";
- else
- fileName =
Utils.getJavaLocalName(fileName) + ".java";
-
-try {
-if (Utils.fileExists(fileName,
-binding.getQName().getNamespaceURI(),
-emitter.getNamespaces())) {
-if (!emitter.isQuiet()) {
-System.out.println(
- Messages.getMessage("wontOverwrite",
- fileName));
-}
-} else {
-implWriter = getJavaImplWriter(emitter, bEntry,
-symbolTable);
+// Use custom implementation classname if available
+String fileName = emitter.getImplementationClassName();
+if ( fileName == null)
+ fileName =
Utils.getJavaLocalName(bEntry.getName())
+ + "Impl.java";
+ else
+
svn commit: r1388670 - in /axis/axis1/java/trunk: axis-rt-transports-http-javanet/ integration/ maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/ samples/echo-sample/ s
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 @@
src/test/wsdl/test.wsdl
- true
+ both
http://www.example.org/test/
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 @@
../samples/echo-sample/src/main/wsdl/InteropTest.wsdl
+client
1.1
@@ -196,6 +197,7 @@
../distribution/src/main/files/samples/addr/AddressBook.wsdl
+client
1.1
@@ -215,7 +217,7 @@
src/test/wsdl/_import/Import.wsdl
-true
+both
true
true
@@ -244,7 +246,7 @@
src/test/wsdl/_import/Import.wsdl
-true
+both
true
true
@@ -287,6 +289,7 @@
src/test/wsdl/_import/ImportMessagesXSDImport.wsdl
+client
urn:types.import.test
@@ -303,7 +306,7 @@
src/test/wsdl/adaptive/adaptive.wsdl
-true
+both
http://com.test/wsdl/Adaptive
@@ -329,7 +332,7 @@
src/test/wsdl/any/any.wsdl
true
-true
+both
urn:partner.soap.sforce.com
@@ -351,7 +354,7 @@
${project.build.directory}/work/test/wsdl/anytype/AnyService.wsdl
true
-true
+both
http://test.com/AnyService
@@ -369,7 +372,7 @@
src/test/wsdl/arrays/ArrayTest.wsdl
session
-true
+both
true
svn commit: r1388690 - in /axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java: AbstractWsdl2JavaMojo.java GenerateSourcesMojo.java GenerateTestSourc
Author: veithen
Date: Fri Sep 21 21:28:53 2012
New Revision: 1388690
URL: http://svn.apache.org/viewvc?rev=1388690&view=rev
Log:
Some documentation improvements.
Modified:
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
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=1388690&r1=1388689&r2=1388690&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 21:28:53 2012
@@ -68,7 +68,17 @@ public abstract class AbstractWsdl2JavaM
private String url;
/**
- * Add scope to deploy.xml: "Application", "Request", "Session".
+ * Determines the scope that will be specified for the service in the
deployment WSDD. Valid
+ * values are application, request and
session. This
+ * parameter has no effect if {@link #generate} is set to
client or if
+ * {@link #deployWsdd} is not specified. If this parameter is not
specified, then no explicit
+ * scope will be configured in the deployment WSDD, in which case the
scope defaults to
+ * request.
+ *
+ * Note that these semantics (in particular the default scope
request) are
+ * compatible with the deployScope parameter of the wsdl2java
Ant task. This
+ * simplifies the migration of Ant builds to Maven. However, for most
services,
+ * application is a more reasonable setting.
*
* @parameter
*/
@@ -85,22 +95,19 @@ public abstract class AbstractWsdl2JavaM
* The default type mapping registry to use. Either 1.1 or 1.2.
*
* @parameter default-value="1.2"
- * @required
*/
private String typeMappingVersion;
/**
- *
* Specifies what artifacts should be generated. Valid values are:
*
* client: generate client stubs
* server: generate server side artifacts
* both: generate all artifacts
*
- *
* The server 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.
- *
+ *
* Also note that the both mode is only really meaningful if
{@link #skeleton} is
* set to true or if {@link #deployWsdd} is specified. If
none of these conditions
* is satisfied, then client and both will
generate the same set of
@@ -112,19 +119,20 @@ public abstract class AbstractWsdl2JavaM
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
client.
+ * Set the name of the class implementing the web service. This parameter
is ignored if
+ * {@link #generate} is set to client. If this parameter is
not specified, then a
+ * default class name will be chosen if necessary.
*
* @parameter
*/
private String implementationClassName;
/**
- * deploy skeleton (true) or implementation (false) in deploy.wsdd.
- * Default is false. This parameter is ignored if {@link #generate} is set
to
- * client.
+ * Specifies whether a skeleton should be generated. If this parameter is
set to
+ * false, a skeleton will not be generated. Instead, the
generated deployment WSDD
+ * will indicate that the implementation class is deployed directly. In
such cases, the WSDD
+ * contains extra meta data describing the operations and parameters of
the implementation
+ * class. This parameter is ignored if {@link #generate} is set to
client.
*
* @parameter default-value="false"
*/
@@ -181,7 +189,7 @@ public abstract class AbstractWsdl2JavaM
/**
* 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.
+ * change the Java class associated
with an XML type.
*
* @parameter
*/
Modified:
axis/axis1/java/trunk/maven/maven-wsdl2ja
