cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [6/7] git commit: Reader needs to read until the END_ELEMENT beyond the level we started at to get all the content of the element
Date Fri, 02 May 2014 20:11:31 GMT
Reader needs to read until the END_ELEMENT beyond the level we started at to get all the content of the element


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e43c0580
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e43c0580
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e43c0580

Branch: refs/heads/2.7.x-fixes
Commit: e43c0580f853ec6f082a2158a8ec72bf37835750
Parents: b3bd610
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri May 2 12:17:17 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri May 2 15:56:40 2014 -0400

----------------------------------------------------------------------
 .../org/apache/cxf/staxutils/StaxUtils.java     |   2 +-
 .../cxf/staxutils/W3CDOMStreamWriter.java       |   6 +-
 .../org/apache/cxf/staxutils/StaxUtilsTest.java |   7 +-
 .../handler/logical/LogicalMessageImpl.java     |  23 +-
 .../cxf/systest/ws/action/ActionTest.java       |  11 +-
 .../apache/cxf/systest/ws/action/Server.java    |  41 +++
 .../ws/action/SignatureWhitespaceTest.java      |   2 -
 .../cxf/systest/ws/action/server/Server.java    |  41 ---
 .../org/apache/cxf/systest/ws/action/client.xml | 211 +++++++++------
 .../cxf/systest/ws/action/client/client.xml     | 166 ------------
 .../org/apache/cxf/systest/ws/action/server.xml | 262 +++++++++++--------
 .../cxf/systest/ws/action/server/server.xml     | 179 -------------
 12 files changed, 354 insertions(+), 597 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e43c0580/api/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/staxutils/StaxUtils.java b/api/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
index dba4db1..5f83cfa 100644
--- a/api/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
+++ b/api/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
@@ -736,7 +736,7 @@ public final class StaxUtils {
                     writer.writeEndElement();
                 }
                 read--;
-                if (read <= 0 && fragment) {
+                if (read < 0 && fragment) {
                     return;
                 }
                 if (isThreshold && !countStack.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/e43c0580/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java b/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
index bd25321..fa2af8d 100644
--- a/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
+++ b/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
@@ -299,7 +299,11 @@ public class W3CDOMStreamWriter implements XMLStreamWriter {
     }
 
     public void writeCharacters(String text) throws XMLStreamException {
-        currentNode.appendChild(document.createTextNode(text));
+        if (currentNode != null) {
+            currentNode.appendChild(document.createTextNode(text));
+        } else {
+            document.appendChild(document.createTextNode(text));
+        }
     }
 
     public void writeCharacters(char[] text, int start, int len) throws XMLStreamException {

http://git-wip-us.apache.org/repos/asf/cxf/blob/e43c0580/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java b/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
index 3851f63..17eb0f6 100644
--- a/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
+++ b/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
@@ -370,10 +370,10 @@ public class StaxUtilsTest extends Assert {
         String innerXml =
                 "<inner>\n"
                 + "<body>body text here</body>\n"
-                + "</inner>";
+                + "</inner>\n";
         String xml =
                 "<outer>\n"
-                + innerXml + "\n"
+                + innerXml
                 + "</outer>";
 
         StringReader reader = new StringReader(xml);
@@ -397,7 +397,8 @@ public class StaxUtilsTest extends Assert {
         swriter.flush();
         swriter.close();
 
-        System.out.println(sw.toString());
+        //System.out.println(innerXml);
+        //System.out.println(sw.toString());
         assertEquals(innerXml, sw.toString());
     }    
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e43c0580/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
index 299c32d..49a54cb 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
@@ -27,7 +27,6 @@ import java.util.logging.Logger;
 import javax.activation.DataSource;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
 import javax.xml.stream.XMLStreamException;
@@ -40,6 +39,7 @@ import javax.xml.ws.LogicalMessage;
 import javax.xml.ws.Service;
 import javax.xml.ws.WebServiceException;
 
+import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -98,15 +98,15 @@ public class LogicalMessageImpl implements LogicalMessage {
 
                 if (source == null) {
                     try {
-                        W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
+                        Document doc = DOMUtils.newDocument();
+                        W3CDOMStreamWriter writer = new W3CDOMStreamWriter(doc.createDocumentFragment());
                         reader = message.getContent(XMLStreamReader.class);
                         //content must be an element thing, skip over any whitespace
                         StaxUtils.toNextTag(reader);
                         StaxUtils.copy(reader, writer, true);
-                        source = new DOMSource(writer.getDocument().getDocumentElement());
-                        reader = StaxUtils.createXMLStreamReader(writer.getDocument());
-                    } catch (ParserConfigurationException e) {
-                        throw new Fault(e);
+                        doc.appendChild(DOMUtils.getFirstElement(writer.getCurrentFragment()));
+                        source = new DOMSource(doc.getDocumentElement());
+                        reader = StaxUtils.createXMLStreamReader(doc.getDocumentElement());
                     } catch (XMLStreamException e) {
                         throw new Fault(e);
                     }
@@ -114,12 +114,7 @@ public class LogicalMessageImpl implements LogicalMessage {
                 message.setContent(XMLStreamReader.class, reader);
                 message.setContent(Source.class, source);
             } else if (!(source instanceof DOMSource)) {
-                W3CDOMStreamWriter writer;
-                try {
-                    writer = new W3CDOMStreamWriter();
-                } catch (ParserConfigurationException e) {
-                    throw new Fault(e);
-                }
+                W3CDOMStreamWriter writer = new W3CDOMStreamWriter(DOMUtils.newDocument());
                 XMLStreamReader reader = message.getContent(XMLStreamReader.class);
                 if (reader == null) {
                     reader = StaxUtils.createXMLStreamReader(source);
@@ -261,13 +256,11 @@ public class LogicalMessageImpl implements LogicalMessage {
 
     public void setPayload(Object arg0, JAXBContext arg1) {
         try {
-            W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
+            W3CDOMStreamWriter writer = new W3CDOMStreamWriter(DOMUtils.newDocument());
             arg1.createMarshaller().marshal(arg0, writer);
             Source source = new DOMSource(writer.getDocument().getDocumentElement());            
             
             setPayload(source);
-        } catch (ParserConfigurationException e) {
-            throw new WebServiceException(e);
         } catch (JAXBException e) {
             throw new WebServiceException(e);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e43c0580/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
index e0871b2..2e22300 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
@@ -28,7 +28,6 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.systest.ws.action.server.Server;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.systest.ws.ut.SecurityHeaderCacheInterceptor;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -64,7 +63,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
     public void test3DESEncryptionGivenKey() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = ActionTest.class.getResource("client/client.xml");
+        URL busFile = ActionTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -86,7 +85,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
     public void testUsernameToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = ActionTest.class.getResource("client/client.xml");
+        URL busFile = ActionTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -124,7 +123,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
     public void testUsernameTokenReplay() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = ActionTest.class.getResource("client/client.xml");
+        URL busFile = ActionTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -160,7 +159,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
     public void testSignedTimestampReplay() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = ActionTest.class.getResource("client/client.xml");
+        URL busFile = ActionTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -196,7 +195,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
     public void testSAMLToken() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = ActionTest.class.getResource("client/client.xml");
+        URL busFile = ActionTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);

http://git-wip-us.apache.org/repos/asf/cxf/blob/e43c0580/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java
new file mode 100644
index 0000000..9a0561a
--- /dev/null
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.ws.action;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+public class Server extends AbstractBusTestServerBase {
+
+    public Server() {
+
+    }
+
+    protected void run()  {
+        URL busFile = Server.class.getResource("server.xml");
+        Bus busLocal = new SpringBusFactory().createBus(busFile);
+        BusFactory.setDefaultBus(busLocal);
+        setBus(busLocal);
+    }
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/e43c0580/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
index 823d30d..c396e0d 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
@@ -82,9 +82,7 @@ public class SignatureWhitespaceTest extends AbstractBusClientServerTestBase {
         bus.shutdown(true);
     }
     
-    // TODO test not working
     @org.junit.Test
-    @org.junit.Ignore
     public void testTrailingWhitespaceInSOAPBody() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = SignatureWhitespaceTest.class.getResource("client.xml");

http://git-wip-us.apache.org/repos/asf/cxf/blob/e43c0580/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/server/Server.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/server/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/server/Server.java
deleted file mode 100644
index 0d99165..0000000
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/server/Server.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.ws.action.server;
-
-import java.net.URL;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-
-public class Server extends AbstractBusTestServerBase {
-
-    public Server() {
-
-    }
-
-    protected void run()  {
-        URL busFile = Server.class.getResource("server.xml");
-        Bus busLocal = new SpringBusFactory().createBus(busFile);
-        BusFactory.setDefaultBus(busLocal);
-        setBus(busLocal);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/e43c0580/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml
index 0dca80c..01a3486 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml
@@ -17,101 +17,150 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation="           http://www.springframework.org/schema/beans           http://www.springframework.org/schema/beans/spring-beans.xsd           http://cxf.apache.org/jaxws                           http://cxf.apache.org/schemas/jaxws.xsd           http://cxf.apache.org/transports/http/configuration   http://cxf.apache.org/schemas/configuration/http-conf.xsd           http://cxf.apache.org/configuration/security          http://cxf.apache.org/schemas/configuration/security.xsd           http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd           http://cxf.apache.org/policy http://cxf.apache.org/schemas/poli
 cy.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:jaxws="http://cxf.apache.org/jaxws"
+       xmlns:cxf="http://cxf.apache.org/core"
+       xmlns:p="http://cxf.apache.org/policy"
+       xmlns:sec="http://cxf.apache.org/configuration/security"
+       xsi:schemaLocation="
+          http://www.springframework.org/schema/beans           http://www.springframework.org/schema/beans/spring-beans.xsd
+          http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
+          http://cxf.apache.org/jaxws                           http://cxf.apache.org/schemas/jaxws.xsd
+          http://cxf.apache.org/transports/http/configuration   http://cxf.apache.org/schemas/configuration/http-conf.xsd
+          http://cxf.apache.org/configuration/security          http://cxf.apache.org/schemas/configuration/security.xsd
+          http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+          http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
     <cxf:bus>
         <cxf:features>
             <p:policies/>
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleIt3DESEncryptionPort" createdFromAPI="true">
-        <jaxws:outInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Encrypt"/>
+    
+    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleIt3DESEncryptionPort" 
+                  createdFromAPI="true">
+       <jaxws:outInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="Encrypt"/> 
                         <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.action.SecretKeyPasswordCallback"/>
                         <entry key="encryptSymmetricEncryptionKey" value="false"/>
-                        <entry key="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:outInterceptors>
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Encrypt"/>
+                        <entry key="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> 
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:outInterceptors>
+       <jaxws:inInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="Encrypt"/> 
                         <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.action.SecretKeyPasswordCallback"/>
-                        <entry key="isBSPCompliant" value="false"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
+                        <entry key="isBSPCompliant" value="false"/>  
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:inInterceptors>
     </jaxws:client>
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItUsernameTokenPort" createdFromAPI="true">
-        <jaxws:outInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="UsernameToken"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
+    
+    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItUsernameTokenPort" 
+                  createdFromAPI="true">
+       <jaxws:outInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="UsernameToken"/> 
+                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
                         <entry key="user" value="Alice"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:outInterceptors>
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:outInterceptors>
     </jaxws:client>
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedPasswordPort" createdFromAPI="true">
-        <jaxws:outInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Encrypt"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
+    
+    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedPasswordPort" 
+                  createdFromAPI="true">
+       <jaxws:outInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="Encrypt"/> 
+                        <entry key="passwordCallbackClass" 
+                               value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
                         <entry key="encryptionPropFile" value="bob-enc.properties"/>
                         <entry key="encryptionUser" value="bob"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:outInterceptors>
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Encrypt"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:outInterceptors>
+       <jaxws:inInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="Encrypt"/> 
+                        <entry key="passwordCallbackClass" 
+                               value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
                         <entry key="decryptionPropFile" value="alice-enc.properties"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:inInterceptors>
     </jaxws:client>
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedTimestampPort" createdFromAPI="true">
-        <jaxws:outInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Signature Timestamp"/>
+    
+    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedTimestampPort" 
+                  createdFromAPI="true">
+       <jaxws:outInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="Signature Timestamp"/> 
                         <entry key="signatureUser" value="alice"/>
-                        <entry key="signaturePropFile" value="alice.properties"/>
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                         <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                        <entry key="signatureParts" value="{}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{}{http://schemas.xmlsoap.org/soap/envelope/}Body;"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:outInterceptors>
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Signature"/>
-                        <entry key="signatureVerificationPropFile" value="alice.properties"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
+                        <entry key="signatureParts"
+                               value="{}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{}{http://schemas.xmlsoap.org/soap/envelope/}Body;" />
+                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:outInterceptors>
+       <jaxws:inInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="Signature"/> 
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:inInterceptors>
+    </jaxws:client>
+    
+    <bean id="samlCallbackHandler" class="org.apache.cxf.systest.ws.saml.client.SamlCallbackHandler">
+        <property name="confirmationMethod" value="urn:oasis:names:tc:SAML:2.0:cm:bearer" />
+    </bean>
+    
+    <util:properties id="samlProperties" location="classpath:saml_sv.properties"/>
+    
+    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSamlTokenPort" 
+                  createdFromAPI="true">
+       <jaxws:outInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="SAMLTokenUnsigned"/> 
+                        <entry key="samlCallbackRef" value-ref="samlCallbackHandler"/>
+                        <entry key="samlPropRefId" value="samlPropertiesId" />
+                        <entry key="samlPropertiesId" value-ref="samlProperties" />
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:outInterceptors>
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignaturePort" createdFromAPI="true">
         <jaxws:outInterceptors>
@@ -120,9 +169,9 @@
                     <map>
                         <entry key="action" value="Signature"/>
                         <entry key="signatureUser" value="alice"/>
-                        <entry key="signaturePropFile" value="alice.properties"/>
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                         <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
+                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
                     </map>
                 </constructor-arg>
             </bean>
@@ -132,10 +181,12 @@
                 <constructor-arg>
                     <map>
                         <entry key="action" value="Signature"/>
-                        <entry key="signatureVerificationPropFile" value="alice.properties"/>
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                     </map>
                 </constructor-arg>
             </bean>
         </jaxws:inInterceptors>
     </jaxws:client>
+    
+    
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e43c0580/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml
deleted file mode 100644
index e0cac1d..0000000
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:jaxws="http://cxf.apache.org/jaxws"
-       xmlns:cxf="http://cxf.apache.org/core"
-       xmlns:p="http://cxf.apache.org/policy"
-       xmlns:sec="http://cxf.apache.org/configuration/security"
-       xsi:schemaLocation="
-          http://www.springframework.org/schema/beans           http://www.springframework.org/schema/beans/spring-beans.xsd
-          http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
-          http://cxf.apache.org/jaxws                           http://cxf.apache.org/schemas/jaxws.xsd
-          http://cxf.apache.org/transports/http/configuration   http://cxf.apache.org/schemas/configuration/http-conf.xsd
-          http://cxf.apache.org/configuration/security          http://cxf.apache.org/schemas/configuration/security.xsd
-          http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
-          http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
->
-    <cxf:bus>
-        <cxf:features>
-            <p:policies/>
-            <cxf:logging/>
-        </cxf:features>
-    </cxf:bus>
-    
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleIt3DESEncryptionPort" 
-                  createdFromAPI="true">
-       <jaxws:outInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="Encrypt"/> 
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.action.SecretKeyPasswordCallback"/>
-                        <entry key="encryptSymmetricEncryptionKey" value="false"/>
-                        <entry key="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> 
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:outInterceptors>
-       <jaxws:inInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="Encrypt"/> 
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.action.SecretKeyPasswordCallback"/>
-                        <entry key="isBSPCompliant" value="false"/>  
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:inInterceptors>
-    </jaxws:client>
-    
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItUsernameTokenPort" 
-                  createdFromAPI="true">
-       <jaxws:outInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="UsernameToken"/> 
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
-                        <entry key="user" value="Alice"/>
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:outInterceptors>
-    </jaxws:client>
-    
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedPasswordPort" 
-                  createdFromAPI="true">
-       <jaxws:outInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="Encrypt"/> 
-                        <entry key="passwordCallbackClass" 
-                               value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-                        <entry key="encryptionPropFile" value="bob-enc.properties"/>
-                        <entry key="encryptionUser" value="bob"/>
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:outInterceptors>
-       <jaxws:inInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="Encrypt"/> 
-                        <entry key="passwordCallbackClass" 
-                               value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-                        <entry key="decryptionPropFile" value="alice-enc.properties"/>
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:inInterceptors>
-    </jaxws:client>
-    
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedTimestampPort" 
-                  createdFromAPI="true">
-       <jaxws:outInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="Signature Timestamp"/> 
-                        <entry key="signatureUser" value="alice"/>
-                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
-                        <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                        <entry key="signatureParts"
-                               value="{}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{}{http://schemas.xmlsoap.org/soap/envelope/}Body;" />
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:outInterceptors>
-       <jaxws:inInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="Signature"/> 
-                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:inInterceptors>
-    </jaxws:client>
-    
-    <bean id="samlCallbackHandler" class="org.apache.cxf.systest.ws.saml.client.SamlCallbackHandler">
-        <property name="confirmationMethod" value="urn:oasis:names:tc:SAML:2.0:cm:bearer" />
-    </bean>
-    
-    <util:properties id="samlProperties" location="classpath:saml_sv.properties"/>
-    
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSamlTokenPort" 
-                  createdFromAPI="true">
-       <jaxws:outInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="SAMLTokenUnsigned"/> 
-                        <entry key="samlCallbackRef" value-ref="samlCallbackHandler"/>
-                        <entry key="samlPropRefId" value="samlPropertiesId" />
-                        <entry key="samlPropertiesId" value-ref="samlProperties" />
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:outInterceptors>
-    </jaxws:client>
-    
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e43c0580/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
index 71fac62..1a42f37 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
@@ -17,124 +17,180 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xsi:schemaLocation="         http://www.springframework.org/schema/beans                     http://www.springframework.org/schema/beans/spring-beans.xsd         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd         http://cxf.apache.org/jaxws                                     http://cxf.apache.org/schemas/jaxws.xsd         http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd         http://cxf.apache.org/policy http://cxf.apache.org/s
 chemas/policy.xsd         http://cxf.apache.org/transports/http/configuration             http://cxf.apache.org/schemas/configuration/http-conf.xsd         http://cxf.apache.org/transports/http-jetty/configuration       http://cxf.apache.org/schemas/configuration/http-jetty.xsd         http://cxf.apache.org/configuration/security                    http://cxf.apache.org/schemas/configuration/security.xsd     ">
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:jaxws="http://cxf.apache.org/jaxws"
+    xmlns:http="http://cxf.apache.org/transports/http/configuration"
+    xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+    xmlns:sec="http://cxf.apache.org/configuration/security"
+    xmlns:cxf="http://cxf.apache.org/core"
+    xmlns:p="http://cxf.apache.org/policy"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans                     http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
+        http://cxf.apache.org/jaxws                                     http://cxf.apache.org/schemas/jaxws.xsd
+        http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+        http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
+        http://cxf.apache.org/transports/http/configuration             http://cxf.apache.org/schemas/configuration/http-conf.xsd
+        http://cxf.apache.org/transports/http-jetty/configuration       http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+        http://cxf.apache.org/configuration/security                    http://cxf.apache.org/schemas/configuration/security.xsd
+    ">
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+    
     <cxf:bus>
         <cxf:features>
             <p:policies/>
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TripleDESEncryption" address="http://localhost:${testutil.ports.Server}/DoubleIt3DESEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleIt3DESEncryptionPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-        <jaxws:outInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Encrypt"/>
+    
+    <jaxws:endpoint 
+       id="TripleDESEncryption"
+       address="http://localhost:${testutil.ports.Server}/DoubleIt3DESEncryption" 
+       serviceName="s:DoubleItService"
+       endpointName="s:DoubleIt3DESEncryptionPort"
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+       <jaxws:outInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="Encrypt"/> 
                         <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.action.SecretKeyPasswordCallback"/>
                         <entry key="encryptSymmetricEncryptionKey" value="false"/>
-                        <entry key="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:outInterceptors>
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Encrypt"/>
+                        <entry key="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> 
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:outInterceptors>
+       <jaxws:inInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="Encrypt"/> 
                         <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.action.SecretKeyPasswordCallback"/>
-                        <entry key="isBSPCompliant" value="false"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
-    </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameToken" address="http://localhost:${testutil.ports.Server}/DoubleItUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="UsernameToken"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
-    </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameToken2" address="http://localhost:${testutil.ports.Server}/DoubleItUsernameToken2" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="UsernameToken"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
-    </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedPassword" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedPassword" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPasswordPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-        <jaxws:outInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Encrypt"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-                        <entry key="encryptionPropFile" value="alice-enc.properties"/>
-                        <entry key="encryptionUser" value="alice"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:outInterceptors>
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Encrypt"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-                        <entry key="decryptionPropFile" value="bob-enc.properties"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
-    </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedTimestamp" address="http://localhost:${testutil.ports.Server}/DoubleItSignedTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedTimestampPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-        <jaxws:outInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Signature"/>
-                        <entry key="signatureUser" value="bob"/>
-                        <entry key="signaturePropFile" value="bob.properties"/>
+                        <entry key="isBSPCompliant" value="false"/> 
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:inInterceptors>
+     
+    </jaxws:endpoint> 
+    
+    <jaxws:endpoint 
+       id="UsernameToken"
+       address="http://localhost:${testutil.ports.Server}/DoubleItUsernameToken" 
+       serviceName="s:DoubleItService"
+       endpointName="s:DoubleItUsernameTokenPort"
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+       <jaxws:inInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="UsernameToken"/> 
+                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:inInterceptors>
+     
+    </jaxws:endpoint> 
+    
+    <jaxws:endpoint 
+       id="UsernameToken2"
+       address="http://localhost:${testutil.ports.Server}/DoubleItUsernameToken2" 
+       serviceName="s:DoubleItService"
+       endpointName="s:DoubleItUsernameTokenPort2"
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+       <jaxws:inInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="UsernameToken"/> 
+                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:inInterceptors>
+     
+    </jaxws:endpoint> 
+    
+    
+    <jaxws:endpoint 
+       id="SignedTimestamp"
+       address="http://localhost:${testutil.ports.Server}/DoubleItSignedTimestamp" 
+       serviceName="s:DoubleItService"
+       endpointName="s:DoubleItSignedTimestampPort"
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+       <jaxws:outInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="Signature"/> 
+                        <entry key="signatureUser" value="bob"/> 
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
                         <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:outInterceptors>
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Signature Timestamp"/>
-                        <entry key="signatureVerificationPropFile" value="bob.properties"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
-    </jaxws:endpoint>
+                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:outInterceptors>
+       <jaxws:inInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="Signature Timestamp"/> 
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:inInterceptors>
+     
+    </jaxws:endpoint> 
     
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Signature" address="http://localhost:${testutil.ports.Server}/DoubleItSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+    <jaxws:endpoint 
+       id="SamlToken"
+       address="http://localhost:${testutil.ports.Server}/DoubleItSamlToken" 
+       serviceName="s:DoubleItService"
+       endpointName="s:DoubleItSamlTokenPort"
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+       <jaxws:inInterceptors>
+           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+               <constructor-arg>
+                   <map>
+                        <entry key="action" value="SAMLTokenUnsigned"/> 
+                   </map>
+               </constructor-arg>
+           </bean>
+       </jaxws:inInterceptors>
+     
+    </jaxws:endpoint> 
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" 
+    	id="Signature" 
+    	address="http://localhost:${testutil.ports.Server}/DoubleItSignature" 
+    	serviceName="s:DoubleItService" 
+    	endpointName="s:DoubleItSignaturePort" 
+    	implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
+    	wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
         <jaxws:outInterceptors>
             <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
                 <constructor-arg>
                     <map>
                         <entry key="action" value="Signature"/>
                         <entry key="signatureUser" value="bob"/>
-                        <entry key="signaturePropFile" value="bob.properties"/>
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
                         <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
+                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
                     </map>
                 </constructor-arg>
             </bean>
@@ -144,7 +200,7 @@
                 <constructor-arg>
                     <map>
                         <entry key="action" value="Signature"/>
-                        <entry key="signatureVerificationPropFile" value="bob.properties"/>
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
                     </map>
                 </constructor-arg>
             </bean>
@@ -158,9 +214,9 @@
                     <map>
                         <entry key="action" value="Signature"/>
                         <entry key="signatureUser" value="bob"/>
-                        <entry key="signaturePropFile" value="bob.properties"/>
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
                         <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
+                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
                     </map>
                 </constructor-arg>
             </bean>
@@ -170,7 +226,7 @@
                 <constructor-arg>
                     <map>
                         <entry key="action" value="Signature"/>
-                        <entry key="signatureVerificationPropFile" value="bob.properties"/>
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
                     </map>
                 </constructor-arg>
             </bean>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e43c0580/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml
deleted file mode 100644
index 3db80b4..0000000
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:util="http://www.springframework.org/schema/util"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:http="http://cxf.apache.org/transports/http/configuration"
-    xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
-    xmlns:sec="http://cxf.apache.org/configuration/security"
-    xmlns:cxf="http://cxf.apache.org/core"
-    xmlns:p="http://cxf.apache.org/policy"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans                     http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
-        http://cxf.apache.org/jaxws                                     http://cxf.apache.org/schemas/jaxws.xsd
-        http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
-        http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
-        http://cxf.apache.org/transports/http/configuration             http://cxf.apache.org/schemas/configuration/http-conf.xsd
-        http://cxf.apache.org/transports/http-jetty/configuration       http://cxf.apache.org/schemas/configuration/http-jetty.xsd
-        http://cxf.apache.org/configuration/security                    http://cxf.apache.org/schemas/configuration/security.xsd
-    ">
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-    
-    <cxf:bus>
-        <cxf:features>
-            <p:policies/>
-            <cxf:logging/>
-        </cxf:features>
-    </cxf:bus>
-    
-    <jaxws:endpoint 
-       id="TripleDESEncryption"
-       address="http://localhost:${testutil.ports.Server}/DoubleIt3DESEncryption" 
-       serviceName="s:DoubleItService"
-       endpointName="s:DoubleIt3DESEncryptionPort"
-       xmlns:s="http://www.example.org/contract/DoubleIt"
-       implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
-       wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-       <jaxws:outInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="Encrypt"/> 
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.action.SecretKeyPasswordCallback"/>
-                        <entry key="encryptSymmetricEncryptionKey" value="false"/>
-                        <entry key="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> 
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:outInterceptors>
-       <jaxws:inInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="Encrypt"/> 
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.action.SecretKeyPasswordCallback"/>
-                        <entry key="isBSPCompliant" value="false"/> 
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:inInterceptors>
-     
-    </jaxws:endpoint> 
-    
-    <jaxws:endpoint 
-       id="UsernameToken"
-       address="http://localhost:${testutil.ports.Server}/DoubleItUsernameToken" 
-       serviceName="s:DoubleItService"
-       endpointName="s:DoubleItUsernameTokenPort"
-       xmlns:s="http://www.example.org/contract/DoubleIt"
-       implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
-       wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-       <jaxws:inInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="UsernameToken"/> 
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:inInterceptors>
-     
-    </jaxws:endpoint> 
-    
-    <jaxws:endpoint 
-       id="UsernameToken2"
-       address="http://localhost:${testutil.ports.Server}/DoubleItUsernameToken2" 
-       serviceName="s:DoubleItService"
-       endpointName="s:DoubleItUsernameTokenPort2"
-       xmlns:s="http://www.example.org/contract/DoubleIt"
-       implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
-       wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-       <jaxws:inInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="UsernameToken"/> 
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:inInterceptors>
-     
-    </jaxws:endpoint> 
-    
-    
-    <jaxws:endpoint 
-       id="SignedTimestamp"
-       address="http://localhost:${testutil.ports.Server}/DoubleItSignedTimestamp" 
-       serviceName="s:DoubleItService"
-       endpointName="s:DoubleItSignedTimestampPort"
-       xmlns:s="http://www.example.org/contract/DoubleIt"
-       implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
-       wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-       <jaxws:outInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="Signature"/> 
-                        <entry key="signatureUser" value="bob"/> 
-                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
-                        <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:outInterceptors>
-       <jaxws:inInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="Signature Timestamp"/> 
-                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:inInterceptors>
-     
-    </jaxws:endpoint> 
-    
-    <jaxws:endpoint 
-       id="SamlToken"
-       address="http://localhost:${testutil.ports.Server}/DoubleItSamlToken" 
-       serviceName="s:DoubleItService"
-       endpointName="s:DoubleItSamlTokenPort"
-       xmlns:s="http://www.example.org/contract/DoubleIt"
-       implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
-       wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-       <jaxws:inInterceptors>
-           <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-               <constructor-arg>
-                   <map>
-                        <entry key="action" value="SAMLTokenUnsigned"/> 
-                   </map>
-               </constructor-arg>
-           </bean>
-       </jaxws:inInterceptors>
-     
-    </jaxws:endpoint> 
-    
-</beans>


Mime
View raw message