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 ru...@apache.org on 2006/08/31 09:55:14 UTC
svn commit: r438832 - in /webservices/axis2/trunk/java/modules/security:
maven.xml test/org/apache/rampart/policy/model/RampartPolicyTest.java
Author: ruchithf
Date: Thu Aug 31 00:55:13 2006
New Revision: 438832
URL: http://svn.apache.org/viewvc?rev=438832&view=rev
Log:
Adding the METS-INF/services stuff to the classpath for the policy assertion builders to be picked up and updating the rampart config policy test case
Modified:
webservices/axis2/trunk/java/modules/security/maven.xml
webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/policy/model/RampartPolicyTest.java
Modified: webservices/axis2/trunk/java/modules/security/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/maven.xml?rev=438832&r1=438831&r2=438832&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/security/maven.xml Thu Aug 31 00:55:13 2006
@@ -129,6 +129,12 @@
<!-- Interop client -->
<copy file="interop/org/apache/axis2/security/InteropScenarioClient.java"
tofile="${work.dir}/src/org/apache/axis2/security/InteropScenarioClient.java" overwrite="yes"/>
+
+ <copy toDir="target/classes/META-INF/">
+ <fileset dir="src/META-INF">
+ <include name="**/services/*"/>
+ </fileset>
+ </copy>
<ant:path id="classes.dir" location="${class.dir}"/>
<maven:addPath id="maven.dependency.classpath" refid="classes.dir"/>
Modified: webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/policy/model/RampartPolicyTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/policy/model/RampartPolicyTest.java?rev=438832&r1=438831&r2=438832&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/policy/model/RampartPolicyTest.java (original)
+++ webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/policy/model/RampartPolicyTest.java Thu Aug 31 00:55:13 2006
@@ -44,38 +44,38 @@
Assertion assertion = (Assertion)policy.getAssertions().get(0);
-// assertEquals("Incorrect namespace in RampartConfig",
-// RAMPART_CONFIG_NAME.getNamespaceURI(), assertion.getName()
-// .getNamespaceURI());
-// assertEquals("Incorrect localname in RampartConfig",
-// RAMPART_CONFIG_NAME.getLocalPart(), assertion.getName()
-// .getLocalPart());
-//
-// RampartConfig config = (RampartConfig) assertion;
-// CryptoConfig sigCryptoConfig = config.getSigCryptoConfig();
-//
-// assertNotNull("Signature Crypto missing", sigCryptoConfig);
-//
-// assertEquals("Incorrect namespace in SignatureCrypto",
-// CRYPTO_CONFIG_NAME.getNamespaceURI(), sigCryptoConfig
-// .getName().getNamespaceURI());
-// assertEquals("Incorrect localname in SignatureCrypto",
-// CRYPTO_CONFIG_NAME.getLocalPart(), sigCryptoConfig.getName()
-// .getLocalPart());
-//
-// assertEquals("Incorrect provider value",
-// "org.apache.ws.security.components.crypto.Merlin",
-// sigCryptoConfig.getProvider());
-//
-// Properties prop = sigCryptoConfig.getProp();
-// assertEquals("Incorrect number of properties", 3, prop.size());
-//
-// assertEquals("Incorrect property value", "JKS", prop
-// .getProperty("keystoreType"));
-// assertEquals("Incorrect property value", "/path/to/file.jks", prop
-// .getProperty("keystoreFile"));
-// assertEquals("Incorrect property value", "password", prop
-// .getProperty("keystorePassword"));
+ assertEquals("Incorrect namespace in RampartConfig",
+ RAMPART_CONFIG_NAME.getNamespaceURI(), assertion.getName()
+ .getNamespaceURI());
+ assertEquals("Incorrect localname in RampartConfig",
+ RAMPART_CONFIG_NAME.getLocalPart(), assertion.getName()
+ .getLocalPart());
+
+ RampartConfig config = (RampartConfig) assertion;
+ CryptoConfig sigCryptoConfig = config.getSigCryptoConfig();
+
+ assertNotNull("Signature Crypto missing", sigCryptoConfig);
+
+ assertEquals("Incorrect namespace in SignatureCrypto",
+ CRYPTO_CONFIG_NAME.getNamespaceURI(), sigCryptoConfig
+ .getName().getNamespaceURI());
+ assertEquals("Incorrect localname in SignatureCrypto",
+ CRYPTO_CONFIG_NAME.getLocalPart(), sigCryptoConfig.getName()
+ .getLocalPart());
+
+ assertEquals("Incorrect provider value",
+ "org.apache.ws.security.components.crypto.Merlin",
+ sigCryptoConfig.getProvider());
+
+ Properties prop = sigCryptoConfig.getProp();
+ assertEquals("Incorrect number of properties", 3, prop.size());
+
+ assertEquals("Incorrect property value", "JKS", prop
+ .getProperty("keystoreType"));
+ assertEquals("Incorrect property value", "/path/to/file.jks", prop
+ .getProperty("keystoreFile"));
+ assertEquals("Incorrect property value", "password", prop
+ .getProperty("keystorePassword"));
} catch (Exception e) {
e.printStackTrace();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org