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 ru...@apache.org on 2005/09/07 18:32:17 UTC

svn commit: r279371 - in /webservices/axis2/trunk/java/modules: integration/test-resources/security/secMtom.service.axis2.xml security/src/org/apache/axis2/security/util/MessageOptimizer.java

Author: ruchithf
Date: Wed Sep  7 09:31:57 2005
New Revision: 279371

URL: http://svn.apache.org/viewcvs?rev=279371&view=rev
Log:
Minor change to MessageOptimizer to handler XPath expressions with more possible namespaces and adding optimization to the response path of the test scenario

Modified:
    webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml
    webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml?rev=279371&r1=279370&r2=279371&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml Wed Sep  7 09:31:57 2005
@@ -24,6 +24,8 @@
     <parameter name="encryptionKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
     <parameter name="encryptionUser" locked="false">alice</parameter>
 
+    <parameter name="optimizeParts" locked="false">//xenc:EncryptedData/xenc:CipherData/xenc:CipherValue</parameter>
+
     <!-- Scenario 3: Service's Configuration: END-->
 
     <!-- ================================================= -->

Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java?rev=279371&r1=279370&r2=279371&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java Wed Sep  7 09:31:57 2005
@@ -63,18 +63,13 @@
 			XPath xp = new AXIOMXPath(expression);
 			
 			//Set namespaces
-			SimpleNamespaceContext encNsCtx = new SimpleNamespaceContext();
-			encNsCtx.addNamespace(WSConstants.ENC_PREFIX,WSConstants.ENC_NS);
+			SimpleNamespaceContext nsCtx = new SimpleNamespaceContext();
+			nsCtx.addNamespace(WSConstants.ENC_PREFIX,WSConstants.ENC_NS);
+			nsCtx.addNamespace(WSConstants.SIG_PREFIX,WSConstants.SIG_NS);
+			nsCtx.addNamespace(WSConstants.WSSE_PREFIX,WSConstants.WSSE_NS);
+			nsCtx.addNamespace(WSConstants.WSU_PREFIX,WSConstants.WSU_NS);
 			
-//			SimpleNamespaceContext sigNsCtx = new SimpleNamespaceContext();
-//			encNsCtx.addNamespace(WSConstants.SIG_PREFIX,WSConstants.SIG_NS);
-//			
-//			SimpleNamespaceContext wsseNsCtx = new SimpleNamespaceContext();
-//			encNsCtx.addNamespace(WSConstants.WSSE_PREFIX,WSConstants.WSSE_NS);
-			
-			xp.setNamespaceContext(encNsCtx);
-//			xp.setNamespaceContext(sigNsCtx);
-//			xp.setNamespaceContext(wsseNsCtx);
+			xp.setNamespaceContext(nsCtx);
 			
 			return xp.selectNodes(elem);