ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r366073 - in /webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen: CodeGenConfiguration.java XSLTConstants.java extension/PackageFinder.java
Date Thu, 05 Jan 2006 04:03:57 GMT
Author: dims
Date: Wed Jan  4 20:03:54 2006
New Revision: 366073

URL: http://svn.apache.org/viewcvs?rev=366073&view=rev
Log:
generate package name for source files from the wsdl namespace if it is not specified in the
command line parameters

Modified:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTConstants.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java?rev=366073&r1=366072&r2=366073&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
Wed Jan  4 20:03:54 2006
@@ -19,6 +19,7 @@
 import org.apache.axis2.wsdl.databinding.TypeMapper;
 import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader;
 import org.apache.axis2.wsdl.i18n.CodegenMessages;
+import org.apache.axis2.util.URLProcessor;
 import org.apache.wsdl.WSDLDescription;
 
 import java.io.File;
@@ -44,7 +45,7 @@
     private boolean generateDeployementDescriptor = true;
     private boolean writeTestCase = false;
     private boolean writeMessageReceiver = true;
-    private String packageName = XSLTConstants.DEFAULT_PACKAGE_NAME;
+    private String packageName = URLProcessor.DEFAULT_PACKAGE;
 
     // Default packClasses is true, which means the classes generated
     // by default are wrapped. The effect of this setting will be controlled

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTConstants.java?rev=366073&r1=366072&r2=366073&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTConstants.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTConstants.java
Wed Jan  4 20:03:54 2006
@@ -19,7 +19,6 @@
 import javax.xml.namespace.QName;
  //todo rename this
 public interface XSLTConstants {
-    String DEFAULT_PACKAGE_NAME = "codegen";
     QName BASE_64_CONTENT_QNAME = new QName("http://www.w3.org/2001/XMLSchema", "base64Binary");
     QName XMIME_CONTENT_TYPE_QNAME = new QName("http://www.w3.org/2004/06/xmlmime", "contentType");
 

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java?rev=366073&r1=366072&r2=366073&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java
Wed Jan  4 20:03:54 2006
@@ -24,7 +24,7 @@
 
     public void engage() {
         String packageName = this.configuration.getPackageName();
-        if (packageName == null) {
+        if (packageName == null || URLProcessor.DEFAULT_PACKAGE.equals(packageName)) {
             WSDLBinding binding = configuration.getWom().getBinding(
                     AxisBindingBuilder.AXIS_BINDING_QNAME);
             String temp = binding.getBoundInterface().getName()



Mime
View raw message