Author: thomas.diesler(a)jboss.com Date: 2007-02-03 10:57:43 -0500 (Sat, 03 Feb 2007) New Revision: 2258 Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.keystore branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.truststore Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml branches/jbossws-1.2.0/jbossws-tests/src/main/README_XERCES branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml Log: WSSecurityConfigFactory silently ignores required resources Fix round trip set/getNodeValue for exscaped XML Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java 2007-02-03 14:05:49 UTC (rev 2257) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java 2007-02-03 15:57:43 UTC (rev 2258) @@ -21,17 +21,13 @@ */ package javax.xml.rpc.soap; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.ObjectStreamField; +// $Id$ import javax.xml.namespace.QName; import javax.xml.soap.Detail; import javax.xml.soap.Name; import org.jboss.logging.Logger; -import org.jboss.util.id.SerialVersion; /** The SOAPFaultException exception represents a SOAP fault. * @@ -49,36 +45,12 @@ * @author Scott.Stark(a)jboss.org * @author Thomas.Diesler(a)jboss.org * @author Rahul Sharma (javadoc) - * @version $Revision$ */ public class SOAPFaultException extends RuntimeException { // provide logging private static Logger log = Logger.getLogger(SOAPFaultException.class); - /** @since 4.0.2 */ - static final long serialVersionUID; - private static final int CODE_IDX = 0; - private static final int STRING_IDX = 1; - private static final int ACTOR_IDX = 2; - private static final int DETAIL_IDX = 3; - private static final ObjectStreamField[] serialPersistentFields; - static - { - if (SerialVersion.version == SerialVersion.LEGACY) - { - serialVersionUID = -290987278985292477L; - serialPersistentFields = new ObjectStreamField[] { new ObjectStreamField("faultCode", QName.class), new ObjectStreamField("faultString", String.class), - new ObjectStreamField("faultActor", String.class), new ObjectStreamField("faultDetail", Detail.class), }; - } - else - { - serialVersionUID = -7224636940495025621L; - serialPersistentFields = new ObjectStreamField[] { new ObjectStreamField("faultcode", QName.class), new ObjectStreamField("faultstring", String.class), - new ObjectStreamField("faultactor", String.class), new ObjectStreamField("faultdetail", Detail.class), }; - } - } - private QName faultCode; private String faultString; private String faultActor; @@ -116,33 +88,4 @@ { return faultDetail; } - - // Private ------------------------------------------------------- - private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException - { - ObjectInputStream.GetField fields = ois.readFields(); - String name = serialPersistentFields[CODE_IDX].getName(); - this.faultCode = (QName)fields.get(name, null); - name = serialPersistentFields[STRING_IDX].getName(); - this.faultString = (String)fields.get(name, null); - name = serialPersistentFields[ACTOR_IDX].getName(); - this.faultActor = (String)fields.get(name, null); - name = serialPersistentFields[DETAIL_IDX].getName(); - this.faultDetail = (Detail)fields.get(name, null); - } - - private void writeObject(ObjectOutputStream oos) throws IOException - { - // Write j2ee 1.4.1 RI field names - ObjectOutputStream.PutField fields = oos.putFields(); - String name = serialPersistentFields[CODE_IDX].getName(); - fields.put(name, faultCode); - name = serialPersistentFields[STRING_IDX].getName(); - fields.put(name, faultString); - name = serialPersistentFields[ACTOR_IDX].getName(); - fields.put(name, faultActor); - name = serialPersistentFields[DETAIL_IDX].getName(); - fields.put(name, faultDetail); - oos.writeFields(); - } } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-02-03 14:05:49 UTC (rev 2257) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-02-03 15:57:43 UTC (rev 2258) @@ -187,8 +187,6 @@ org.w3c.dom.Node child = (org.w3c.dom.Node)getFirstChild(); - value = DOMWriter.normalize(value, false); - if (child instanceof org.w3c.dom.Text) ((org.w3c.dom.Text)child).setNodeValue(value); Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java 2007-02-03 14:05:49 UTC (rev 2257) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java 2007-02-03 15:57:43 UTC (rev 2258) @@ -57,14 +57,22 @@ // $Id$ -import org.jboss.logging.Logger; -import org.w3c.dom.*; - -import java.io.*; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.io.Writer; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.w3c.dom.Attr; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + /** * Traverse a DOM tree in order to print a document that is parsed. * @@ -74,7 +82,6 @@ */ public class DOMWriter { - private static Logger log = Logger.getLogger(DOMWriter.class); // Print writer private PrintWriter out; // True, if canonical output @@ -93,9 +100,9 @@ private Node rootNode; // True if we want namespace completion private boolean completeNamespaces = true; + // True if we want escaped XML text content + private boolean escapeCharacters = true; - private boolean escapeCharacters = false; - public DOMWriter(Writer w) { this.out = new PrintWriter(w); Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-02-03 14:05:49 UTC (rev 2257) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-02-03 15:57:43 UTC (rev 2258) @@ -143,7 +143,9 @@ SecurityDecoder decoder = new SecurityDecoder(securityStore); decoder.decode(soapMessage.getSOAPPart(), secHeaderElement); - log.debug("Decoded Message:\n" + DOMWriter.printNode(soapMessage.getSOAPPart(), true)); + + if (log.isTraceEnabled()) + log.trace("Decoded Message:\n" + DOMWriter.printNode(soapMessage.getSOAPPart(), true)); OperationMetaData opMetaData = ctx.getOperationMetaData(); if (opMetaData == null) @@ -178,7 +180,7 @@ { WSSecurityConfiguration config = ctx.getEndpointMetaData().getServiceMetaData().getSecurityConfiguration(); if (config == null) - throw new WSException("Cannot obtatin security configuration from message context"); + throw new WSException("Cannot obtain security configuration from message context"); return config; } @@ -232,7 +234,7 @@ Config operationConfig = getConfig(config, port, operation); - log.debug("WS-Security config:" + operationConfig); + log.debug("WS-Security config: " + operationConfig); // Nothing to process if (operationConfig == null) return; Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-02-03 14:05:49 UTC (rev 2257) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-02-03 15:57:43 UTC (rev 2258) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.extensions.security.jaxrpc; // $Id$ @@ -99,34 +99,25 @@ EndpointMetaData epMetaData = ((SOAPMessageContextJAXRPC)msgContext).getEndpointMetaData(); ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); - if(null == serviceMetaData.getSecurityConfiguration()) // might be set through ServiceObjectFactory + WSSecurityConfiguration config = serviceMetaData.getSecurityConfiguration(); + if (config == null) // might be set through ServiceObjectFactory { - UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile(); - boolean successful = false; - - WSSecurityConfiguration config = null; - try { WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); + UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile(); config = wsseConfFactory.createConfiguration(vfsRoot, getConfigResourceName()); - if(config!=null) successful = true; - } catch (IOException e) { - successful = false; + throw new WSException("Cannot obtain security config: " + getConfigResourceName()); } - if(!successful) - throw new WSException("Cannot obtain security config: " +getConfigResourceName()); - // it's required further down the processing chain serviceMetaData.setSecurityConfiguration(config); } - return serviceMetaData.getSecurityConfiguration(); - + return config; } protected abstract String getConfigResourceName(); Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-03 14:05:49 UTC (rev 2257) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-03 15:57:43 UTC (rev 2258) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.metadata.wsse; // $Id: $ @@ -27,6 +27,7 @@ import java.net.URL; import org.jboss.logging.Logger; +import org.jboss.ws.WSException; import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; @@ -48,9 +49,9 @@ { WSSecurityConfiguration config = null; - URL location = getResource(vfsRoot, "WEB-INF/" + resourceName); - if(null == location) - location = getResource(vfsRoot, "META-INF/" + resourceName); + URL location = getResource(vfsRoot, "WEB-INF/" + resourceName, false); + if (null == location) + location = getResource(vfsRoot, "META-INF/" + resourceName, false); if (location != null) { @@ -60,39 +61,35 @@ // Get and set deployment path to the keystore file if (config.getKeyStoreFile() != null) { - location = getResource(vfsRoot, config.getKeyStoreFile()); - if (location != null) - { - log.debug("Add keystore: " + location); - config.setKeyStoreURL(location); - } + location = getResource(vfsRoot, config.getKeyStoreFile(), true); + log.debug("Add keystore: " + location); + config.setKeyStoreURL(location); } if (config.getTrustStoreFile() != null) { - location = getResource(vfsRoot, config.getTrustStoreFile()); - if (location != null) - { - log.debug("Add truststore: " + location); - config.setTrustStoreURL(location); - } + location = getResource(vfsRoot, config.getTrustStoreFile(), true); + log.debug("Add truststore: " + location); + config.setTrustStoreURL(location); } } return config; } - private URL getResource(UnifiedVirtualFile vfsRoot, String resource) + private URL getResource(UnifiedVirtualFile vfsRoot, String resource, boolean failOnNotFound) { + URL resourceURL = null; try { UnifiedVirtualFile child = vfsRoot.findChild(resource); - return child.toURL(); + resourceURL = child.toURL(); } - catch (Exception e) + catch (IOException ex) { - return null; + if (failOnNotFound) + throw new WSException("Cannot find required security resource: " + resource); } + return resourceURL; } - } Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-03 14:05:49 UTC (rev 2257) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-03 15:57:43 UTC (rev 2258) @@ -2601,32 +2601,6 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxrpc-wsse-account-signup.war --> - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_signup_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_signup_ResponseStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="jboss-wsse-server.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - - <!-- jaxrpc-wsse-account-signup-client.jar --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> @@ -2665,8 +2639,6 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxrpc-wsse-rpc-client.jar --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> @@ -2683,8 +2655,6 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - - <!-- jaxrpc-wsse-rpc-none-client --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc-none-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> @@ -2725,8 +2695,6 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxrpc-wsse-simple-encrypt-client.jar --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> @@ -2768,8 +2736,6 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxrpc-wsse-sign-fault-client.jar --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-fault-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> @@ -2811,8 +2777,6 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxrpc-wsse-sign-encrypt-fault-client.jar --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-encrypt-fault-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> @@ -2856,8 +2820,6 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/README_XERCES =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/README_XERCES 2007-02-03 14:05:49 UTC (rev 2257) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/README_XERCES 2007-02-03 15:57:43 UTC (rev 2258) @@ -1,4 +1,6 @@ -This is a xerces bug. The problem is that the latest version of ant only bundles 2.6.2, you need at least 2.7.0 for this not to happen. So all you need to do is update your version of ant. I actually use the one in jboss-head/tools, although you have to drop log4j.jar in jboss-head/tools/lib. +This is a xerces bug. The problem is that the latest version of ant only bundles 2.6.2, you need at least 2.7.0 for this not to happen. +So all you need to do is update your version of ant. I actually use the one in jboss-head/tools, although you have to drop log4j.jar +in jboss-head/tools/lib. -Jason Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2007-02-03 14:05:49 UTC (rev 2257) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2007-02-03 15:57:43 UTC (rev 2258) @@ -2,10 +2,10 @@ <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> <!--Note ${buildpath} will be replaced with the actual build directory path --> - <key-store-password>{EXT}java -cp ${buildpath}/classes org.jboss.test.ws.jaxrpc.wsse.PasswordUtil ${buildpath}/resources/jaxrpc/samples/wssecurity/keystore.password</key-store-password> + <key-store-password>{EXT}java -cp ${buildpath}/classes org.jboss.test.ws.jaxrpc.wsse.PasswordUtil ${buildpath}/resources/jaxrpc/wsse/keystore.password</key-store-password> <trust-store-file>WEB-INF/wsse.truststore</trust-store-file> <!--Note ${buildpath} will be replaced with the actual build directory path --> - <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:${buildpath}/resources/jaxrpc/samples/wssecurity/keystore.password</trust-store-password> + <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:${buildpath}/resources/jaxrpc/wsse/keystore.password</trust-store-password> <config> <sign type="x509v3" alias="wsse"/> <encrypt type="x509v3" alias="wsse"/> Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.keystore =================================================================== (Binary files differ) Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.keystore ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.truststore =================================================================== (Binary files differ) Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.truststore ___________________________________________________________________ Name: svn:mime-type + application/octet-stream