axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r289202 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/context/MessageContext.java security/src/org/apache/axis2/security/WSDoAllReceiver.java security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
Date Thu, 15 Sep 2005 11:14:50 GMT
Author: deepal
Date: Thu Sep 15 04:14:36 2005
New Revision: 289202

URL: http://svn.apache.org/viewcvs?rev=289202&view=rev
Log:
All the test cases are fixed , now the build successful 

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
    webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
    webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=289202&r1=289201&r2=289202&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
Thu Sep 15 04:14:36 2005
@@ -30,6 +30,7 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.util.ArrayList;
 
 /**
  * The palce where all the service specific states are kept.
@@ -622,16 +623,16 @@
      */
     public Parameter getParameter(String key) {
         Parameter param = null;
-        if (operationContext != null) {
-            OperationDescription opDesc = operationContext.getAxisOperation();
+        if (getOperationDescription() != null) {
+            OperationDescription opDesc = getOperationDescription();
             param = opDesc.getParameter(key);
         }
-        if (param == null && serviceContext != null) {
-            ServiceDescription serviceDesc = serviceContext.getServiceConfig();
+        if (param == null && getServiceDescription() != null) {
+            ServiceDescription serviceDesc = getServiceDescription();
             param = serviceDesc.getParameter(key);
         }
-        if (param == null && serviceGroupContext != null) {
-            ServiceGroupDescription serviceDesc = serviceGroupContext.getDescription();
+        if (param == null && getServiceGroupDescription() != null) {
+            ServiceGroupDescription serviceDesc = getServiceGroupDescription();
             param = serviceDesc.getParameter(key);
         }
         if (param == null && configurationContext != null) {
@@ -668,8 +669,8 @@
     public Parameter getModuleParameter(String key, String moduleName, HandlerDescription
handler) {
         Parameter param = null;
         ModuleConfiguration moduleConfig = null;
-        if (operationContext != null) {
-            OperationDescription opDesc = operationContext.getAxisOperation();
+        if (getOperationDescription() != null) {
+            OperationDescription opDesc = getOperationDescription();
             moduleConfig = opDesc.getModuleConfig(new QName(moduleName));
             if (moduleConfig != null) {
                 param = moduleConfig.getParameter(key);
@@ -678,8 +679,8 @@
                 param = opDesc.getParameter(key);
             }
         }
-        if (param == null && serviceContext != null) {
-            ServiceDescription serviceDesc = serviceContext.getServiceConfig();
+        if (param == null && getServiceDescription() != null) {
+            ServiceDescription serviceDesc = getServiceDescription();
             moduleConfig = serviceDesc.getModuleConfig(new QName(moduleName));
             if (moduleConfig != null) {
                 param = moduleConfig.getParameter(key);
@@ -689,8 +690,8 @@
             }
         }
 
-        if (param == null && serviceGroupContext != null) {
-            ServiceGroupDescription serviceDesc = serviceGroupContext.getDescription();
+        if (param == null && getServiceGroupDescription() != null) {
+            ServiceGroupDescription serviceDesc = getServiceGroupDescription();
             moduleConfig = serviceDesc.getModuleConfig(new QName(moduleName));
             if (moduleConfig != null) {
                 param = moduleConfig.getParameter(key);

Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java?rev=289202&r1=289201&r2=289202&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
(original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
Thu Sep 15 04:14:36 2005
@@ -21,10 +21,12 @@
 import java.security.cert.X509Certificate;
 import java.util.Iterator;
 import java.util.Vector;
+import java.util.ArrayList;
 
 import javax.security.auth.callback.CallbackHandler;
 
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.description.Parameter;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.security.handler.WSDoAllHandler;
@@ -66,7 +68,6 @@
         
         try {
         	reqData.setMsgContext(msgContext);
-
             Vector actions = new Vector();
             String action = null;
             if ((action = (String) getOption(WSHandlerConstants.ACTION)) == null) {

Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java?rev=289202&r1=289201&r2=289202&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
(original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
Thu Sep 15 04:14:36 2005
@@ -197,46 +197,10 @@
 
     	Object value = null;
     	
-    	// If the parameters are set in the scope of an peration in service.xml
-		OperationContext operationContext = msgContext.getOperationContext();
-		if (operationContext != null) {
-			OperationDescription operationDesc = operationContext
-					.getAxisOperation();
+        Parameter param = msgContext.getParameter(key);
+		value = (param== null)?null:param.getValue();
 
-			// if the operation desc is available
-			if (operationDesc != null) {
-				Parameter parameter = operationDesc.getParameter(key);
-				value = (parameter != null) ? parameter.getValue() : null;
-			}
-		}
-
-		// If the parameters are set in the scope of the service in service.xml
-		ServiceContext serviceContext = msgContext.getServiceContext();
-		if (serviceContext != null) {
-			ServiceDescription serviceDesc = serviceContext.getServiceConfig();
-
-			// If the parameter is not found in the operation desc and if the
-			// service desc is available
-			if (value == null && serviceDesc != null) {
-				Parameter parameter = serviceDesc.getParameter(key);
-				value = (parameter != null) ? parameter.getValue() : null;
-			}
-		}
-
-		// If the parameters are set globally in the axis2.xml
-		ConfigurationContext systemContext = msgContext.getSystemContext();
-		if (systemContext != null) {
-			AxisConfiguration axisConfig = systemContext.getAxisConfiguration();
-
-			// If the parameter is not found in the service desc the look at the
-			// global config - axis config
-			if (value == null && axisConfig != null) {
-				Parameter parameter = axisConfig.getParameter(key);
-				value = (parameter != null) ? parameter.getValue() : null;
-			}
-		}
-		
-    	// ---------------------------------------------------------------------
+        // ---------------------------------------------------------------------
     	//If value is still null this point then the user has not set the value
     	  
     	



Mime
View raw message