Author: sanka Date: Mon Jun 9 05:51:58 2008 New Revision: 18226 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18226
Log: Removed: branches/wsas/java/2.3/rampart/modules/rampart-core/.classpath branches/wsas/java/2.3/rampart/modules/rampart-core/.settings/org.eclipse.jdt.core.prefs branches/wsas/java/2.3/rampart/modules/rampart-integration/.classpath branches/wsas/java/2.3/rampart/modules/rampart-integration/.settings/org.eclipse.jdt.core.prefs branches/wsas/java/2.3/rampart/modules/rampart-mar/.settings/org.eclipse.jdt.core.prefs branches/wsas/java/2.3/rampart/modules/rampart-policy/.classpath branches/wsas/java/2.3/rampart/modules/rampart-policy/.settings/org.eclipse.jdt.core.prefs branches/wsas/java/2.3/rampart/modules/rampart-tests/.classpath branches/wsas/java/2.3/rampart/modules/rampart-tests/.settings/org.eclipse.jdt.core.prefs branches/wsas/java/2.3/rampart/modules/rampart-trust/.classpath branches/wsas/java/2.3/rampart/modules/rampart-trust/.settings/org.eclipse.jdt.core.prefs Modified: branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java branches/wsas/java/2.3/rampart/modules/rampart-trust-mar/.settings/org.eclipse.jdt.core.prefs Deleted: branches/wsas/java/2.3/rampart/modules/rampart-core/.classpath URL: http://wso2.org/svn/browse/wso2/None?pathrev=18225 Deleted: branches/wsas/java/2.3/rampart/modules/rampart-core/.settings/org.eclipse.jdt.core.prefs URL: http://wso2.org/svn/browse/wso2/None?pathrev=18225 Modified: branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?rev=18226&r1=18225&r2=18226&view=diff ============================================================================== --- branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java (original) +++ branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java Mon Jun 9 05:51:58 2008 @@ -199,7 +199,7 @@ */ if(this.servicePolicy == null) { - this.servicePolicy = msgCtx.getEffectivePolicy(); + this.servicePolicy = RampartUtil.getEffectivePolicy(msgCtx); } if(this.servicePolicy == null) { Modified: branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java?rev=18226&r1=18225&r2=18226&view=diff ============================================================================== --- branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java (original) +++ branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java Mon Jun 9 05:51:58 2008 @@ -90,17 +90,15 @@ */ public InvocationResponse invoke(MessageContext msgContext) throws AxisFault { - Policy policy = msgContext.getEffectivePolicy(); - + Policy policy = null; if(msgContext.getProperty(RampartMessageData.KEY_RAMPART_POLICY) != null) { policy = (Policy)msgContext.getProperty(RampartMessageData.KEY_RAMPART_POLICY); } - - if(policy == null) { - policy = msgContext.getEffectivePolicy(); - } + if (policy == null) { + policy = RampartUtil.getEffectivePolicy(msgContext); + } if(policy == null) { Parameter param = msgContext.getParameter(RampartMessageData.KEY_RAMPART_POLICY); Modified: branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=18226&r1=18225&r2=18226&view=diff ============================================================================== --- branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java (original) +++ branches/wsas/java/2.3/rampart/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java Mon Jun 9 05:51:58 2008 @@ -22,6 +22,8 @@ import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.xpath.AXIOMXPath; +import org.apache.axiom.soap.SOAP11Constants; +import org.apache.axiom.soap.SOAP12Constants; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPHeader; import org.apache.axiom.soap.SOAPHeaderBlock; @@ -32,6 +34,13 @@ import org.apache.axis2.context.MessageContext; import org.apache.axis2.dataretrieval.DRConstants; import org.apache.axis2.dataretrieval.client.MexClient; +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.AxisMessage; +import org.apache.axis2.description.AxisOperation; +import org.apache.axis2.description.AxisService; import org.apache.axis2.description.Parameter; import org.apache.axis2.mex.MexConstants; import org.apache.axis2.mex.MexException; @@ -88,6 +97,7 @@ import javax.crypto.KeyGenerator; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; +import javax.wsdl.extensions.soap.SOAPBinding; import javax.xml.namespace.QName; import java.security.NoSuchAlgorithmException; @@ -1480,5 +1490,44 @@ return wssConfig; } + + public static Policy getEffectivePolicy(MessageContext messageContext) { + AxisBindingMessage bindingMessage = + (AxisBindingMessage) messageContext.getProperty(org.apache.axis2.Constants.AXIS_BINDING_MESSAGE); + if (bindingMessage != null) { + return bindingMessage.getEffectivePolicy(); + } + + // OK .. now we try to figure out whether we can find an appropriate binding. + AxisMessage message = messageContext.getAxisMessage(); + if (message != null) { + SOAPEnvelope env = messageContext.getEnvelope(); + if (env != null) { + AxisService service = messageContext.getAxisService(); + AxisOperation operation = messageContext.getAxisOperation(); + String namespaceURI = env.getNamespace().getNamespaceURI(); + AxisBinding targetBinding = null; + if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI + .equals(namespaceURI)) { + targetBinding = Utils.getSoap11Binding(service); + + } else if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI + .equals(namespaceURI)) { + targetBinding = Utils.getSoap12Binding(service); + } + if (targetBinding != null) { + AxisBindingOperation targetBindingOperation = Utils + .getBindingOperation(targetBinding, operation); + AxisBindingMessage targetBindingMessage = Utils + .getBindingMessage(targetBindingOperation, message); + return targetBindingMessage.getEffectivePolicy(); + } + + } else { + return message.getEffectivePolicy(); + } + } + return null; + } } \ No newline at end of file Deleted: branches/wsas/java/2.3/rampart/modules/rampart-integration/.classpath URL: http://wso2.org/svn/browse/wso2/None?pathrev=18225 Deleted: branches/wsas/java/2.3/rampart/modules/rampart-integration/.settings/org.eclipse.jdt.core.prefs URL: http://wso2.org/svn/browse/wso2/None?pathrev=18225 Deleted: branches/wsas/java/2.3/rampart/modules/rampart-mar/.settings/org.eclipse.jdt.core.prefs URL: http://wso2.org/svn/browse/wso2/None?pathrev=18225 Deleted: branches/wsas/java/2.3/rampart/modules/rampart-policy/.classpath URL: http://wso2.org/svn/browse/wso2/None?pathrev=18225 Deleted: branches/wsas/java/2.3/rampart/modules/rampart-policy/.settings/org.eclipse.jdt.core.prefs URL: http://wso2.org/svn/browse/wso2/None?pathrev=18225 Deleted: branches/wsas/java/2.3/rampart/modules/rampart-tests/.classpath URL: http://wso2.org/svn/browse/wso2/None?pathrev=18225 Deleted: branches/wsas/java/2.3/rampart/modules/rampart-tests/.settings/org.eclipse.jdt.core.prefs URL: http://wso2.org/svn/browse/wso2/None?pathrev=18225 Modified: branches/wsas/java/2.3/rampart/modules/rampart-trust-mar/.settings/org.eclipse.jdt.core.prefs URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/rampart/modules/rampart-trust-mar/.settings/org.eclipse.jdt.core.prefs?rev=18226&r1=18225&r2=18226&view=diff ============================================================================== --- branches/wsas/java/2.3/rampart/modules/rampart-trust-mar/.settings/org.eclipse.jdt.core.prefs (original) +++ branches/wsas/java/2.3/rampart/modules/rampart-trust-mar/.settings/org.eclipse.jdt.core.prefs Mon Jun 9 05:51:58 2008 @@ -1,4 +1,4 @@ -#Wed Jun 04 15:23:17 IST 2008 +#Sat Jun 07 02:11:43 IST 2008 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.source=1.4 Deleted: branches/wsas/java/2.3/rampart/modules/rampart-trust/.classpath URL: http://wso2.org/svn/browse/wso2/None?pathrev=18225 Deleted: branches/wsas/java/2.3/rampart/modules/rampart-trust/.settings/org.eclipse.jdt.core.prefs URL: http://wso2.org/svn/browse/wso2/None?pathrev=18225 _______________________________________________ Wsas-java-dev mailing list Wsas-java-dev@wso2.org http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
