Author: thomas.diesler(a)jboss.com
Date: 2008-05-09 17:26:43 -0400 (Fri, 09 May 2008)
New Revision: 6997
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
stack/native/trunk/modules/testsuite/pom.xml
Log:
Fix StorePassEncryptTestCase
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml 2008-05-09
21:11:22 UTC (rev 6996)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml 2008-05-09
21:26:43 UTC (rev 6997)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jboss-ws-security
xmlns="http://www.jboss.com/ws-security/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.jboss.com/ws-security/config
http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
<key-store-file>WEB-INF/wsse.keystore</key-store-file>
- <key-store-password>{EXT}@java.home(a)/bin/java -cp @tests.output.dir@/test-classes
org.jboss.test.ws.jaxrpc.samples.wssecurity.PasswordUtil
@test.resources.directory(a)/jaxrpc/samples/wssecurity/keystore.password</key-store-password>
+ <key-store-password>{EXT}@java.home(a)/bin/java -cp @test.classes.directory@
org.jboss.test.ws.jaxrpc.samples.wssecurity.PasswordUtil
@test.resources.directory(a)/jaxrpc/samples/wssecurity/keystore.password</key-store-password>
<trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
<trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@test.resources.directory@/jaxrpc/samples/wssecurity/keystore.password</trust-store-password>
<config>
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2008-05-09
21:11:22 UTC (rev 6996)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2008-05-09
21:26:43 UTC (rev 6997)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jboss-ws-security
xmlns="http://www.jboss.com/ws-security/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.jboss.com/ws-security/config
http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
<key-store-file>WEB-INF/wsse.keystore</key-store-file>
- <key-store-password>{EXT}@java.home(a)/bin/java -cp @tests.output.dir@/test-classes
org.jboss.test.ws.jaxrpc.wsse.PasswordUtil
@test.resources.directory(a)/jaxrpc/wsse/keystore.password</key-store-password>
+ <key-store-password>{EXT}@java.home(a)/bin/java -cp @test.classes.directory@
org.jboss.test.ws.jaxrpc.wsse.PasswordUtil
@test.resources.directory(a)/jaxrpc/wsse/keystore.password</key-store-password>
<trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
<trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@test.resources.directory@/jaxrpc/wsse/keystore.password</trust-store-password>
<config>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-05-09 21:11:22 UTC (rev 6996)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-09 21:26:43 UTC (rev 6997)
@@ -19,6 +19,7 @@
<surefire.security.args>-Djava.security.manager
-Djava.security.policy=src/test/etc/tst.policy</surefire.security.args>
<surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
<test.archive.directory>${project.build.directory}/test-libs</test.archive.directory>
+
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
</properties>
@@ -188,6 +189,10 @@
<value>${test.archive.directory}</value>
</property>
<property>
+ <name>test.classes.directory</name>
+ <value>${test.classes.directory}</value>
+ </property>
+ <property>
<name>test.resources.directory</name>
<value>${test.resources.directory}</value>
</property>