You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2006/05/18 13:11:03 UTC

svn commit: r407523 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/deployment/util/Utils.java core/src/org/apache/axis2/description/AxisService.java java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java

Author: deepal
Date: Thu May 18 04:11:02 2006
New Revision: 407523

URL: http://svn.apache.org/viewvc?rev=407523&view=rev
Log:
- when creating service using a java class , it was not set the schema target name space so I fixed that

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java?rev=407523&r1=407522&r2=407523&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java Thu May 18 04:11:02 2006
@@ -211,6 +211,7 @@
         schemaGenerator.setExcludeMethods(excludeOperations);
         Collection schemas = schemaGenerator.generateSchema();
         axisService.addSchema(schemas);
+        axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
 
         JMethod [] method = schemaGenerator.getMethods();
         TypeTable table = schemaGenerator.getTypeTable();

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=407523&r1=407522&r2=407523&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Thu May 18 04:11:02 2006
@@ -57,15 +57,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Class AxisService
@@ -167,15 +159,15 @@
     // Reflects the wsaw:UsingAddressing wsdl extension element
     private String wsaddressingFlag = AddressingConstants.ADDRESSING_UNSPECIFIED;
 
-    public String getWSAddressingFlag(){
-    	return wsaddressingFlag;
+    public String getWSAddressingFlag() {
+        return wsaddressingFlag;
     }
 
-    public void setWSAddressingFlag(String ar){
-    	wsaddressingFlag = ar;
-    	if(wsaddressingFlag == null){
-    		wsaddressingFlag = AddressingConstants.ADDRESSING_UNSPECIFIED;
-    	}
+    public void setWSAddressingFlag(String ar) {
+        wsaddressingFlag = ar;
+        if (wsaddressingFlag == null) {
+            wsaddressingFlag = AddressingConstants.ADDRESSING_UNSPECIFIED;
+        }
     }
 
     public boolean isSchemaLocationsAdjusted() {
@@ -1087,6 +1079,7 @@
             excludeOpeartion.add("destroy");
             schemaGenerator.setExcludeMethods(excludeOpeartion);
             axisService.addSchema(schemaGenerator.generateSchema());
+            axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
         } catch (Exception e) {
             throw new AxisFault(e);
         }
@@ -1172,6 +1165,7 @@
             excludeOpeartion.add("destroy");
             schemaGenerator.setExcludeMethods(excludeOpeartion);
             axisService.addSchema(schemaGenerator.generateSchema());
+            axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
             if (targetNameSpace != null && !"".equals(targetNameSpace)) {
                 axisService.setTargetNamespace(targetNameSpace);
             }

Modified: webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java?rev=407523&r1=407522&r2=407523&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java Thu May 18 04:11:02 2006
@@ -493,4 +493,8 @@
     public void setExcludeMethods(ArrayList excludeMethods) {
         this.excludeMethods = excludeMethods;
     }
+
+    public String getSchemaTargetNameSpace() {
+        return schemaTargetNameSpace;
+    }
 }