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 2007/06/11 21:46:23 UTC
svn commit: r546234 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
deployment/DeploymentConstants.java description/AxisOperation.java
description/AxisService.java
Author: deepal
Date: Mon Jun 11 12:46:22 2007
New Revision: 546234
URL: http://svn.apache.org/viewvc?view=rev&rev=546234
Log:
fixing AXIS2-1431
(if the parameter called "expose" is there in the module operation then we will expose that as web method.)
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java?view=diff&rev=546234&r1=546233&r2=546234
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java Mon Jun 11 12:46:22 2007
@@ -82,6 +82,7 @@
String TAG_HOT_UPDATE = "hotupdate";
String TAG_ANTI_JAR_LOCKING = "antiJARLocking";
String TAG_HOT_DEPLOYMENT = "hotdeployment";
+ String TAG_EXPOSE = "expose";
String TAG_EXTRACT_SERVICE_ARCHIVE = "extractServiceArchive";
String TAG_DISPATCH_ORDER = "dispatchOrder";
String TAG_DISPATCHER = "dispatcher";
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=546234&r1=546233&r2=546234
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Mon Jun 11 12:46:22 2007
@@ -22,7 +22,9 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.axis2.util.WSDLSerializationUtil;
+import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.ConfigurationContext;
@@ -250,7 +252,14 @@
ArrayList wsamappings = axisOperation.getWsamappingList();
if (service.getOperation(axisOperation.getName()) == null) {
// this operation is a control operation.
- axisOperation.setControlOperation(true);
+ Parameter expose = axisOperation.getParameter(DeploymentConstants.TAG_EXPOSE);
+ if(expose!=null){
+ if(JavaUtils.isTrue(expose.getValue(), false)){
+ axisOperation.setControlOperation(true);
+ }
+ } else {
+ axisOperation.setControlOperation(true);
+ }
Module moduleclazz = module.getModule();
if (moduleclazz != null) {
moduleclazz.engageNotify(axisOperation);
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?view=diff&rev=546234&r1=546233&r2=546234
==============================================================================
--- 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 Mon Jun 11 12:46:22 2007
@@ -38,6 +38,7 @@
import org.apache.axis2.dataretrieval.OutputForm;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.deployment.util.Utils;
+import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.DefaultObjectSupplier;
import org.apache.axis2.engine.MessageReceiver;
@@ -50,6 +51,7 @@
import org.apache.axis2.transport.http.server.HttpUtils;
import org.apache.axis2.util.Loader;
import org.apache.axis2.util.XMLUtils;
+import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -484,7 +486,14 @@
}
}
// this operation is a control operation.
- axisOperation.setControlOperation(true);
+ Parameter expose = axisOperation.getParameter(DeploymentConstants.TAG_EXPOSE);
+ if(expose!=null){
+ if(JavaUtils.isTrue(expose.getValue(), false)){
+ axisOperation.setControlOperation(true);
+ }
+ } else {
+ axisOperation.setControlOperation(true);
+ }
this.addOperation(axisOperation);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org