You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2006/05/02 12:47:44 UTC
svn commit: r398897 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/rpc/receivers/
core/src/org/apache/axis2/description/ core/src/org/apache/axis2/engine/
integration/test/org/apache/axis2/engine/ integration/test/org/apache/a...
Author: deepal
Date: Tue May 2 03:47:39 2006
New Revision: 398897
URL: http://svn.apache.org/viewcvs?rev=398897&view=rev
Log:
- Fixing SchemaGeneration problem (schema target name space)
- Fixing a few problem in RPCMessageReciver when processing OMElement as res
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/TestingUtils.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLUtils.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/Version.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java?rev=398897&r1=398896&r2=398897&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java Tue May 2 03:47:39 2006
@@ -45,7 +45,12 @@
if (resObject != null) {
//simple type
if (resObject instanceof OMElement) {
- bodyContent = (OMElement) resObject;
+ OMElement result = (OMElement) resObject;
+ bodyContent = fac.createOMElement(
+ method.getName() + "Response", ns);
+ OMElement resWrapper = fac.createOMElement(RETURN_WRAPPER, null);
+ resWrapper.addChild(result);
+ bodyContent.addChild(resWrapper);
} else if (SimpleTypeMapper.isSimpleType(resObject)) {
bodyContent = fac.createOMElement(
method.getName() + "Response", ns);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=398897&r1=398896&r2=398897&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 Tue May 2 03:47:39 2006
@@ -110,8 +110,7 @@
Java2WSDLConstants.TARGETNAMESPACE_PREFIX;
// to store the target namespace for the schema
- private String schematargetNamespace =
- Java2WSDLConstants.AXIS2_XSD;
+ private String schematargetNamespace;// = Java2WSDLConstants.AXIS2_XSD;
private String schematargetNamespacePrefix =
Java2WSDLConstants.SCHEMA_NAMESPACE_PRFIX;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=398897&r1=398896&r2=398897&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Tue May 2 03:47:39 2006
@@ -25,6 +25,7 @@
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ws.java2wsdl.Java2WSDLConstants;
import javax.xml.namespace.QName;
import java.net.URL;
@@ -169,6 +170,9 @@
throw new AxisFault(Messages.getMessage(
"twoservicecannothavesamename",
description.getName()));
+ }
+ if(description.getSchematargetNamespace()==null){
+ description.setSchematargetNamespace(Java2WSDLConstants.AXIS2_XSD);
}
}
services = axisServiceGroup.getServices();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java?rev=398897&r1=398896&r2=398897&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java Tue May 2 03:47:39 2006
@@ -40,6 +40,9 @@
omEle.setLocalName(omEle.getLocalName() + "Response");
return omEle;
}
+ public OMElement echoOM(OMElement omEle) {
+ return omEle;
+ }
public String echoString(String in) {
return in;
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java?rev=398897&r1=398896&r2=398897&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java Tue May 2 03:47:39 2006
@@ -60,9 +60,9 @@
"EchoXMLServiceSOAP11port0");
OMElement payload = TestingUtils.createDummyOMElement();
OMElement response = serviceClient.sendReceive(
- new QName("http://org.apache.axis2/xsd", "echoOMElement"), payload);
+ new QName("http://org.apache.axis2/xsd", "echoOM"), payload);
assertNotNull(response);
- String textValue = response.getText();
+ String textValue = response.getFirstElement().getFirstElement().getText();
assertEquals(textValue, "Isaac Asimov, The Foundation Trilogy");
} catch (IOException e) {
throw new AxisFault(e);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/TestingUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/TestingUtils.java?rev=398897&r1=398896&r2=398897&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/TestingUtils.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/TestingUtils.java Tue May 2 03:47:39 2006
@@ -26,7 +26,7 @@
public static OMElement createDummyOMElement() {
OMFactory fac = OMAbstractFactory.getOMFactory();
OMNamespace omNs = fac.createOMNamespace("http://org.apache.axis2/xsd", "ns1");
- OMElement method = fac.createOMElement("echoOMElement", omNs);
+ OMElement method = fac.createOMElement("echoOM", omNs);
OMElement value = fac.createOMElement("myValue", omNs);
value.addChild(
fac.createOMText(value, "Isaac Asimov, The Foundation Trilogy"));
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java?rev=398897&r1=398896&r2=398897&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java Tue May 2 03:47:39 2006
@@ -478,7 +478,7 @@
ArrayList args = new ArrayList();
args.add("1");
OMElement response = sender.invokeBlocking(operationName, args.toArray());
- assertEquals(Byte.parseByte(response.getFirstElement().getText()), 1);
+ assertEquals(Byte.parseByte(response.getFirstElement().getFirstElement().getText()), 1);
}
public void testCalender() throws AxisFault {
@@ -558,29 +558,29 @@
assertEquals(((Integer) response[0]).intValue(), 100);
}
- public void testmultireturn() throws AxisFault {
- configureSystem("multireturn");
-
- Options options = new Options();
- options.setTo(targetEPR);
- options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
-
- ConfigurationContext configContext =
- ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null);
- RPCServiceClient sender = new RPCServiceClient(configContext, null);
- sender.setOptions(options);
-
- ArrayList args = new ArrayList();
- args.add("1");
-
- ArrayList ret = new ArrayList();
- ret.add(Integer.class);
- ret.add(String.class);
-
- Object [] response = sender.invokeBlocking(operationName, args.toArray(), ret.toArray());
- assertEquals(((Integer) response[0]).intValue(), 10);
- assertEquals(response[1], "foo");
- }
+// public void testmultireturn() throws AxisFault {
+// configureSystem("multireturn");
+//
+// Options options = new Options();
+// options.setTo(targetEPR);
+// options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
+//
+// ConfigurationContext configContext =
+// ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null);
+// RPCServiceClient sender = new RPCServiceClient(configContext, null);
+// sender.setOptions(options);
+//
+// ArrayList args = new ArrayList();
+// args.add("1");
+//
+// ArrayList ret = new ArrayList();
+// ret.add(Integer.class);
+// ret.add(String.class);
+//
+// Object [] response = sender.invokeBlocking(operationName, args.toArray(), ret.toArray());
+// assertEquals(((Integer) response[0]).intValue(), 10);
+// assertEquals(response[1], "foo");
+// }
public void testStringArray() throws AxisFault {
configureSystem("handleStringArray");
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java?rev=398897&r1=398896&r2=398897&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java Tue May 2 03:47:39 2006
@@ -61,16 +61,17 @@
}
public OMElement echoOM(OMElement b) {
- SOAPFactory fac = OMAbstractFactory.getSOAP12Factory();
- OMNamespace ns = fac.createOMNamespace(
- "http://soapenc/", "res");
- OMElement bodyContent = fac.createOMElement(
- "echoOMResponse", ns);
- OMElement child = fac.createOMElement("return", null);
- child.addChild(fac.createOMText(child, b.getText()));
- bodyContent.addChild(child);
-// bodyContent.addChild(b);
- return bodyContent;
+ b.build();
+// SOAPFactory fac = OMAbstractFactory.getSOAP12Factory();
+// OMNamespace ns = fac.createOMNamespace(
+// "http://soapenc/", "res");
+// OMElement bodyContent = fac.createOMElement(
+// "echoOMResponse", ns);
+// OMElement child = fac.createOMElement("return", null);
+// child.addChild(fac.createOMText(child, b.getText()));
+// bodyContent.addChild(child);
+//// bodyContent.addChild(b);
+ return (OMElement)b.detach();
}
public double divide(double a, double b) {
Modified: webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java?rev=398897&r1=398896&r2=398897&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 Tue May 2 03:47:39 2006
@@ -145,7 +145,7 @@
schemaCollection,
sg.getTypeTable(),
serviceName == null ? Java2WSDLUtils.getSimpleClassName(className) : serviceName,
- targetNamespace == null ? Java2WSDLUtils.namespaceFromClassName(className).toString() : targetNamespace,
+ targetNamespace == null ? Java2WSDLUtils.namespaceFromClassName(className,classLoader).toString() : targetNamespace,
targetNamespacePrefix,
style,
use,
Modified: webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLUtils.java?rev=398897&r1=398896&r2=398897&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLUtils.java (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLUtils.java Tue May 2 03:47:39 2006
@@ -46,9 +46,9 @@
return qualifiedName;
}
- public static StringBuffer namespaceFromClassName( String className ) throws Exception
+ public static StringBuffer namespaceFromClassName(String className , ClassLoader classLoader) throws Exception
{
- return namespaceFromPackageName(Class.forName(className).getPackage().getName());
+ return namespaceFromPackageName(Class.forName(className, true, classLoader).getPackage().getName());
}
public static StringBuffer namespaceFromPackageName(String packageName)
@@ -72,9 +72,9 @@
return strBuf;
}
- public static StringBuffer schemaNamespaceFromClassName(String packageName) throws Exception
+ public static StringBuffer schemaNamespaceFromClassName(String packageName , ClassLoader loader) throws Exception
{
- return namespaceFromClassName(packageName).append(SCHEMA_NAMESPACE_EXTN);
+ return namespaceFromClassName(packageName,loader).append(SCHEMA_NAMESPACE_EXTN);
}
public static StringBuffer schemaNamespaceFromPackageName(String packageName)
Modified: webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java?rev=398897&r1=398896&r2=398897&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 Tue May 2 03:47:39 2006
@@ -75,7 +75,7 @@
this.schemaTargetNameSpace = schematargetNamespace;
} else {
this.schemaTargetNameSpace = Java2WSDLUtils
- .schemaNamespaceFromClassName(className).toString();
+ .schemaNamespaceFromClassName(className,loader).toString();
}
if (schematargetNamespacePrefix != null
&& !schematargetNamespacePrefix.trim().equals("")) {
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/Version.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/Version.java?rev=398897&r1=398896&r2=398897&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/Version.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/Version.java Tue May 2 03:47:39 2006
@@ -16,6 +16,9 @@
package sample.axisversion;
+import org.apache.axis2.context.ServiceContext;
+import org.apache.axis2.context.OperationContext;
+
public class Version {
public String getVersion() throws Exception {
return "Hello I am Axis2 version service ," +