axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r635434 - in /webservices/axis2/trunk/java/modules: adb/src/org/apache/axis2/rpc/receivers/ adb/src/org/apache/axis2/transport/java/ corba/src/org/apache/axis2/corba/deployer/ java2wsdl/src/org/apache/ws/java2wsdl/ kernel/src/org/apache/axi...
Date Mon, 10 Mar 2008 05:34:07 GMT
Author: dims
Date: Sun Mar  9 22:34:05 2008
New Revision: 635434

URL: http://svn.apache.org/viewvc?rev=635434&view=rev
Log:
Fix for AXIS2-3186 - getSchematargetNamespace and setSchematargetNamespacePrefix are typos

Modified:
    webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
    webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/transport/java/JavaTransportSender.java
    webservices/axis2/trunk/java/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
    webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java

Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java?rev=635434&r1=635433&r2=635434&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
(original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
Sun Mar  9 22:34:05 2008
@@ -34,7 +34,6 @@
 import org.apache.axis2.databinding.utils.reader.NullXMLStreamReader;
 import org.apache.axis2.description.AxisMessage;
 import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.description.java2wsdl.TypeTable;
 import org.apache.axis2.engine.ObjectSupplier;
 import org.apache.axis2.util.StreamWrapper;
@@ -324,7 +323,7 @@
                                            SOAPEnvelope envelope, String partName) {
         QName resName;
         if (service.isElementFormDefault()) {
-            resName = new QName(service.getSchematargetNamespace(),
+            resName = new QName(service.getSchemaTargetNamespace(),
                     partName,
                     service.getSchemaTargetNamespacePrefix());
         } else {
@@ -352,7 +351,7 @@
         if (resObject == null) {
             QName resName;
             if (service.isElementFormDefault()) {
-                resName = new QName(service.getSchematargetNamespace(),
+                resName = new QName(service.getSchemaTargetNamespace(),
                         RETURN_WRAPPER,
                         service.getSchemaTargetNamespacePrefix());
             } else {
@@ -363,7 +362,7 @@
             StAXOMBuilder stAXOMBuilder =
                     OMXMLBuilderFactory.createStAXOMBuilder(
                             OMAbstractFactory.getSOAP11Factory(), parser);
-            ns = fac.createOMNamespace(service.getSchematargetNamespace(),
+            ns = fac.createOMNamespace(service.getSchemaTargetNamespace(),
                     service.getSchemaTargetNamespacePrefix());
             OMElement bodyChild = fac.createOMElement(method.getName() + "Response", ns);
             bodyChild.addChild(stAXOMBuilder.getDocumentElement());

Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/transport/java/JavaTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/transport/java/JavaTransportSender.java?rev=635434&r1=635433&r2=635434&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/transport/java/JavaTransportSender.java
(original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/transport/java/JavaTransportSender.java
Sun Mar  9 22:34:05 2008
@@ -117,7 +117,7 @@
             //Send empty body
             envelope.getBody().addChild(fac.createOMElement("item", ns));
         } else if (resObject instanceof Object[]) {
-            QName resName = new QName(service.getSchematargetNamespace(),
+            QName resName = new QName(service.getSchemaTargetNamespace(),
                     method.getName() + "Response",
                     service.getSchemaTargetNamespacePrefix());
             //create the omelement from the response array

Modified: webservices/axis2/trunk/java/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java?rev=635434&r1=635433&r2=635434&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
(original)
+++ webservices/axis2/trunk/java/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
Sun Mar  9 22:34:05 2008
@@ -421,12 +421,12 @@
         NamespaceMap map = new NamespaceMap();
         map.put(Java2WSDLConstants.AXIS2_NAMESPACE_PREFIX, Java2WSDLConstants.AXIS2_XSD);
         map.put(Java2WSDLConstants.DEFAULT_SCHEMA_NAMESPACE_PREFIX, Java2WSDLConstants.URI_2001_SCHEMA_XSD);
-        axisService.setNameSpacesMap(map);
+        axisService.setNamespaceMap(map);
 
         Parameter interfaceNameParam = axisService.getParameter(INTERFACE_NAME);
         String interfaceName = (String) ((interfaceNameParam==null) ? null : interfaceNameParam.getValue());
         SchemaGenerator schemaGenerator = new SchemaGenerator(idl, interfaceName,
-                axisService.getSchematargetNamespace(),
+                axisService.getSchemaTargetNamespace(),
                 axisService.getSchemaTargetNamespacePrefix());
         schemaGenerator.setExcludeMethods(excludeOperations);
         schemaGenerator.setNonRpcMethods(nonRpcMethods);

Modified: webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java?rev=635434&r1=635433&r2=635434&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
Sun Mar  9 22:34:05 2008
@@ -40,7 +40,6 @@
 
 import java.io.OutputStream;
 import java.lang.reflect.Constructor;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -247,7 +246,7 @@
 		axisService.setTargetNamespacePrefix(getTargetNamespacePrefix());
 		axisService.setSchemaTargetNamespace(getSchemaTargetNamespace());
 		axisService
-				.setSchematargetNamespacePrefix(getSchemaTargetNamespacePrefix());
+				.setSchemaTargetNamespacePrefix(getSchemaTargetNamespacePrefix());
 		String uri = locationUri;
 		if (uri == null) {
 			uri = DEFAULT_LOCATION_URL

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=635434&r1=635433&r2=635434&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
Sun Mar  9 22:34:05 2008
@@ -20,10 +20,7 @@
 package org.apache.axis2.deployment;
 
 import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -33,18 +30,12 @@
 
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.AddressingHelper;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.dataretrieval.DRConstants;
 import org.apache.axis2.deployment.util.PhasesInfo;
 import org.apache.axis2.deployment.util.Utils;
-import org.apache.axis2.description.AxisBinding;
-import org.apache.axis2.description.AxisBindingMessage;
-import org.apache.axis2.description.AxisBindingOperation;
-import org.apache.axis2.description.AxisEndpoint;
 import org.apache.axis2.description.AxisMessage;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisOperationFactory;
@@ -53,19 +44,15 @@
 import org.apache.axis2.description.ModuleConfiguration;
 import org.apache.axis2.description.ParameterInclude;
 import org.apache.axis2.description.PolicyInclude;
-import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
 import org.apache.axis2.description.java2wsdl.TypeTable;
-import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.engine.ObjectSupplier;
 import org.apache.axis2.engine.ServiceLifeCycle;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.util.Loader;
-import org.apache.axis2.util.WSDLSerializationUtil;
 import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.axis2.wsdl.WSDLUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -240,7 +227,7 @@
 
 				// package to namespace mapping. This will be an element that
 				// maps pkg names to a namespace
-				// when this is doing AxisService.getSchematargetNamespace will
+				// when this is doing AxisService.getSchemaTargetNamespace will
 				// be overridden
 				// This will be <mapping/> with @namespace and @package
 				Iterator mappingIterator = schemaElement

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=635434&r1=635433&r2=635434&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
Sun Mar  9 22:34:05 2008
@@ -379,19 +379,19 @@
 				Java2WSDLConstants.AXIS2_XSD);
 		map.put(Java2WSDLConstants.DEFAULT_SCHEMA_NAMESPACE_PREFIX,
 				Java2WSDLConstants.URI_2001_SCHEMA_XSD);
-		axisService.setNameSpacesMap(map);
+		axisService.setNamespaceMap(map);
 		SchemaGenerator schemaGenerator;
 		Parameter generateBare = axisService
 				.getParameter(Java2WSDLConstants.DOC_LIT_BARE_PARAMETER);
 		if (generateBare != null && "true".equals(generateBare.getValue())) {
 			schemaGenerator = new DocLitBareSchemaGenerator(serviceClassLoader,
 					serviceClass.trim(),
-					axisService.getSchematargetNamespace(), axisService
+					axisService.getSchemaTargetNamespace(), axisService
 							.getSchemaTargetNamespacePrefix(), axisService);
 		} else {
 			schemaGenerator = new DefaultSchemaGenerator(serviceClassLoader,
 					serviceClass.trim(),
-					axisService.getSchematargetNamespace(), axisService
+					axisService.getSchemaTargetNamespace(), axisService
 							.getSchemaTargetNamespacePrefix(), axisService);
 		}
 		schemaGenerator.setExcludeMethods(excludeOperations);

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?rev=635434&r1=635433&r2=635434&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
Sun Mar  9 22:34:05 2008
@@ -1790,7 +1790,15 @@
 		this.active = active;
 	}
 
-	public String getSchematargetNamespace() {
+    /**
+     * @deprecated please use getSchemaTargetNamespace
+     * @return
+     */
+    public String getSchematargetNamespace() {
+        return schematargetNamespace;
+    }
+
+	public String getSchemaTargetNamespace() {
 		return schematargetNamespace;
 	}
 
@@ -1802,7 +1810,16 @@
 		return schematargetNamespacePrefix;
 	}
 
-	public void setSchematargetNamespacePrefix(
+    /**
+     * @deprecated please use setSchemaTargetNamespacePrefix
+     * @param schematargetNamespacePrefix
+     */
+    public void setSchematargetNamespacePrefix(
+            String schematargetNamespacePrefix) {
+        this.schematargetNamespacePrefix = schematargetNamespacePrefix;
+    }
+
+	public void setSchemaTargetNamespacePrefix(
 			String schematargetNamespacePrefix) {
 		this.schematargetNamespacePrefix = schematargetNamespacePrefix;
 	}
@@ -2147,7 +2164,7 @@
 				Java2WSDLConstants.AXIS2_XSD);
 		map.put(Java2WSDLConstants.DEFAULT_SCHEMA_NAMESPACE_PREFIX,
 				Java2WSDLConstants.URI_2001_SCHEMA_XSD);
-		axisService.setNameSpacesMap(map);
+		axisService.setNamespaceMap(map);
 		Utils.processBeanPropertyExclude(axisService);
 		axisService.setElementFormDefault(false);
 		try {
@@ -2248,12 +2265,11 @@
 		return namespaceMap;
 	}
 
-	/**
-	 * Sets the
-	 * 
-	 * @param nameSpacesMap
-	 */
-	public void setNameSpacesMap(NamespaceMap nameSpacesMap) {
+    /**
+     * @deprecated please use setNamespaceMap
+     * @param nameSpacesMap
+     */
+    public void setNameSpacesMap(NamespaceMap nameSpacesMap) {
 		this.namespaceMap = nameSpacesMap;
 	}
 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=635434&r1=635433&r2=635434&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Sun Mar  9 22:34:05 2008
@@ -316,7 +316,7 @@
 
             // setting target name space
             axisService.setTargetNamespace(wsdl4jDefinition.getTargetNamespace());
-            axisService.setNameSpacesMap(new NamespaceMap(wsdl4jDefinition.getNamespaces()));
+            axisService.setNamespaceMap(new NamespaceMap(wsdl4jDefinition.getNamespaces()));
 
             //TODO : find the service also in imported wsdls
             Service wsdl4jService = findService(wsdl4jDefinition);

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?rev=635434&r1=635433&r2=635434&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
Sun Mar  9 22:34:05 2008
@@ -228,7 +228,7 @@
 
             // Create the namespacemap
 
-            axisService.setNameSpacesMap(stringBasedNamespaceMap);
+            axisService.setNamespaceMap(stringBasedNamespaceMap);
             // TypeDefinition[] typeDefinitions =
             // description.getTypeDefinitions();
             // for(int i=0; i<typeDefinitions.length; i++){

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?rev=635434&r1=635433&r2=635434&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Sun Mar  9 22:34:05 2008
@@ -290,7 +290,7 @@
         Iterator services = axisServiceGroup.getServices();
         while (services.hasNext()) {
             axisService = (AxisService) services.next();
-            if (axisService.getSchematargetNamespace() == null) {
+            if (axisService.getSchemaTargetNamespace() == null) {
                 axisService.setSchemaTargetNamespace(Java2WSDLConstants.AXIS2_XSD);
             }
         }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=635434&r1=635433&r2=635434&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
Sun Mar  9 22:34:05 2008
@@ -79,9 +79,9 @@
             String operation = values[1];
             SOAPFactory soapFactory = new SOAP11Factory();
             SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
-            OMNamespace omNs = soapFactory.createOMNamespace(service.getSchematargetNamespace(),
+            OMNamespace omNs = soapFactory.createOMNamespace(service.getSchemaTargetNamespace(),
                                                              service.getSchemaTargetNamespacePrefix());
-            soapFactory.createOMNamespace(service.getSchematargetNamespace(),
+            soapFactory.createOMNamespace(service.getSchemaTargetNamespace(),
                                           service.getSchemaTargetNamespacePrefix());
             OMElement opElement = soapFactory.createOMElement(operation, omNs);
             Iterator it = map.keySet().iterator();



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message