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/10/19 13:18:17 UTC
svn commit: r465578 - in /webservices/axis2/branches/java/1_1/modules:
kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
samples/groovy/src/sample/groovy/GroovyReceiver.java
samples/groovy/src/sample/groovy/META-INF/services.xml
Author: deepal
Date: Thu Oct 19 04:18:16 2006
New Revision: 465578
URL: http://svn.apache.org/viewvc?view=rev&rev=465578
Log:
fixing AXIS2-1343
Modified:
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/branches/java/1_1/modules/samples/groovy/src/sample/groovy/GroovyReceiver.java
webservices/axis2/branches/java/1_1/modules/samples/groovy/src/sample/groovy/META-INF/services.xml
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=465578&r1=465577&r2=465578
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Thu Oct 19 04:18:16 2006
@@ -112,13 +112,11 @@
}
} else {
if (service.getTargetNamespace() == null ||
- "".equals(service.getTargetNamespace())) {
+ "".equals(service.getTargetNamespace())) {
service.setTargetNamespace(Java2WSDLConstants.DEFAULT_TARGET_NAMESPACE);
}
}
-
-
//Processing service lifecycle attribute
OMAttribute serviceLifeCycleClass = service_element.
getAttribute(new QName(TAG_CLASS_NAME));
@@ -174,7 +172,7 @@
String packageAttributeValue = packageAttribute.getAttributeValue();
if (namespaceAttributeValue != null && packageAttributeValue != null) {
pkg2nsMap.put(packageAttributeValue.trim(),
- namespaceAttributeValue.trim());
+ namespaceAttributeValue.trim());
} else {
log.warn(
"Either value of @namespce or @packagename not available. Thus, generated will be selected.");
@@ -235,7 +233,7 @@
if (policyRefElements != null && policyRefElements.hasNext()) {
processPolicyRefElements(PolicyInclude.AXIS_SERVICE_POLICY,
- policyRefElements, service.getPolicyInclude());
+ policyRefElements, service.getPolicyInclude());
}
//processing service scope
@@ -297,14 +295,8 @@
}
}
} catch (Exception e) {
- /**
- * I have log here if some error occurs , since service impl
- * class can alos be non-Java class , so in that case
- * it is not possible to generate schema, so no pint of throwing that
- * error , I know we have to handle this , until that I have
- * to log this
- */
- log.error(Messages.getMessage("errorinschemagen", e.getMessage()), e);
+ throw new DeploymentException(
+ Messages.getMessage("errorinschemagen", e.getMessage()), e);
}
}
}
@@ -349,9 +341,9 @@
.getMessageReceiver().getClass().getName();
if (!("org.apache.axis2.rpc.receivers.RPCMessageReceiver"
.equals(messageReceiverClass)
- || "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"
+ || "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"
.equals(messageReceiverClass)
- || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
+ || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
.equals(messageReceiverClass))) {
return false;
}
@@ -379,9 +371,9 @@
.getMessageReceiver().getClass().getName();
if (!("org.apache.axis2.rpc.receivers.RPCMessageReceiver"
.equals(messageReceiverClass)
- || "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"
+ || "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"
.equals(messageReceiverClass)
- || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
+ || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
.equals(messageReceiverClass))) {
excludeOperations.add(axisOperation.getName().getLocalPart());
}
@@ -530,11 +522,11 @@
op_descrip.setName(new QName(opname));
String MEP = op_descrip.getMessageExchangePattern();
if (WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
AxisMessage inaxisMessage = op_descrip
.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
if (inaxisMessage != null) {
@@ -543,11 +535,11 @@
}
if (WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
AxisMessage outAxisMessage = op_descrip
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
if (outAxisMessage != null) {
@@ -583,7 +575,7 @@
if (receiverElement != null) {
MessageReceiver messageReceiver = loadMessageReceiver(service.getClassLoader(),
- receiverElement);
+ receiverElement);
op_descrip.setMessageReceiver(messageReceiver);
} else {
Modified: webservices/axis2/branches/java/1_1/modules/samples/groovy/src/sample/groovy/GroovyReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/groovy/src/sample/groovy/GroovyReceiver.java?view=diff&rev=465578&r1=465577&r2=465578
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/groovy/src/sample/groovy/GroovyReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/samples/groovy/src/sample/groovy/GroovyReceiver.java Thu Oct 19 04:18:16 2006
@@ -56,7 +56,7 @@
.getOperationContext()
.getServiceContext()
.getAxisService();
- Parameter implInfoParam = service.getParameter("ServiceClass");
+ Parameter implInfoParam = service.getParameter("GroovyClass");
if (implInfoParam == null) {
throw new AxisFault(
Messages.getMessage("paramIsNotSpecified", "ServiceClass"));
Modified: webservices/axis2/branches/java/1_1/modules/samples/groovy/src/sample/groovy/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/groovy/src/sample/groovy/META-INF/services.xml?view=diff&rev=465578&r1=465577&r2=465578
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/groovy/src/sample/groovy/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/samples/groovy/src/sample/groovy/META-INF/services.xml Thu Oct 19 04:18:16 2006
@@ -4,7 +4,7 @@
and hand that over to Groovy class and which process the message and return a SOAP
message back to MessageReceiver
</description>
- <parameter name="ServiceClass" locked="false">GroovyRcv.groovy</parameter>
+ <parameter name="GroovyClass" locked="false">GroovyRcv.groovy</parameter>
<operation name="echo">
<messageReceiver class="sample.groovy.GroovyReceiver"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org