cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/2] git commit: Some changes from the backmerge
Date Mon, 03 Mar 2014 16:33:40 GMT
Some changes from the backmerge


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

Branch: refs/heads/2.7.x-fixes
Commit: b8d1d726c9dfa128b8227d66f157b14fe697da6f
Parents: 0361002
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Mar 3 16:33:18 2014 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Mar 3 16:33:18 2014 +0000

----------------------------------------------------------------------
 .../cxf/systest/ws/cache/CachingTest.java       | 69 +++++---------------
 .../org/apache/cxf/systest/ws/cache/Server.java | 41 ------------
 .../cxf/systest/ws/cache/server/Server.java     | 41 ++++++++++++
 .../org/apache/cxf/systest/ws/cache/client.xml  | 42 ------------
 .../cxf/systest/ws/cache/client/client.xml      | 42 ++++++++++++
 .../systest/ws/cache/client/per-proxy-cache.xml | 10 +++
 .../cxf/systest/ws/cache/per-proxy-cache.xml    | 10 ---
 .../org/apache/cxf/systest/ws/cache/server.xml  | 43 ------------
 .../cxf/systest/ws/cache/server/server.xml      | 43 ++++++++++++
 9 files changed, 153 insertions(+), 188 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/b8d1d726/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
index 72fa9e3..c324e07 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
@@ -20,8 +20,6 @@
 package org.apache.cxf.systest.ws.cache;
 
 import java.net.URL;
-import java.util.Arrays;
-import java.util.Collection;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.BindingProvider;
@@ -31,32 +29,23 @@ 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.cache.server.Server;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.common.TestParam;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.apache.cxf.ws.security.tokenstore.TokenStore;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
 
 /**
  * A set of tests for token caching on the client side
  */
-@RunWith(value = org.junit.runners.Parameterized.class)
 public class CachingTest extends AbstractBusClientServerTestBase {
     public static final String PORT = allocatePort(Server.class);
 
     private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
     private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
     
-    final TestParam test;
-    
-    public CachingTest(TestParam type) {
-        this.test = type;
-    }
-    
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue(
@@ -67,14 +56,6 @@ public class CachingTest extends AbstractBusClientServerTestBase {
         );
     }
     
-    @Parameters(name = "{0}")
-    public static Collection<TestParam[]> data() {
-       
-        return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
-                                                {new TestParam(PORT, true)},
-        });
-    }
-    
     @org.junit.AfterClass
     public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
@@ -85,7 +66,7 @@ public class CachingTest extends AbstractBusClientServerTestBase {
     public void testSymmetric() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = CachingTest.class.getResource("client.xml");
+        URL busFile = CachingTest.class.getResource("client/client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -98,11 +79,7 @@ public class CachingTest extends AbstractBusClientServerTestBase {
         // First invocation
         DoubleItPortType port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(port, test.getPort());
-        
-        if (test.isStreaming()) {
-            SecurityTestUtil.enableStreaming(port);
-        }
+        updateAddressPort(port, PORT);
         
         port.doubleIt(25);
 
@@ -112,16 +89,12 @@ public class CachingTest extends AbstractBusClientServerTestBase {
                 SecurityConstants.TOKEN_STORE_CACHE_INSTANCE
             );
         assertNotNull(tokenStore);
-        // We expect two tokens as the identifier + SHA-1 are cached
-        assertEquals(tokenStore.getTokenIdentifiers().size(), 2);
+        // We expect 1 token
+        assertEquals(tokenStore.getTokenIdentifiers().size(), 1);
         
         // Second invocation
         port = service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(port, test.getPort());
-        
-        if (test.isStreaming()) {
-            SecurityTestUtil.enableStreaming(port);
-        }
+        updateAddressPort(port, PORT);
         
         port.doubleIt(35);
 
@@ -131,8 +104,8 @@ public class CachingTest extends AbstractBusClientServerTestBase {
                 SecurityConstants.TOKEN_STORE_CACHE_INSTANCE
             );
         assertNotNull(tokenStore);
-        // There should now be 4 tokens as both proxies share the same TokenStore
-        assertEquals(tokenStore.getTokenIdentifiers().size(), 4);
+        // There should now be 2 tokens as both proxies share the same TokenStore
+        assertEquals(tokenStore.getTokenIdentifiers().size(), 2);
         
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -142,7 +115,7 @@ public class CachingTest extends AbstractBusClientServerTestBase {
     public void testCachePerProxySymmetric() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = CachingTest.class.getResource("client.xml");
+        URL busFile = CachingTest.class.getResource("client/client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
         SpringBusFactory.setDefaultBus(bus);
@@ -155,19 +128,15 @@ public class CachingTest extends AbstractBusClientServerTestBase {
         // First invocation
         DoubleItPortType port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(port, test.getPort());
+        updateAddressPort(port, PORT);
         
         ((BindingProvider)port).getRequestContext().put(
             SecurityConstants.CACHE_IDENTIFIER, "proxy1"
         );
         ((BindingProvider)port).getRequestContext().put(
-            SecurityConstants.CACHE_CONFIG_FILE, "per-proxy-cache.xml"
+            SecurityConstants.CACHE_CONFIG_FILE, "client/per-proxy-cache.xml"
         );
         
-        if (test.isStreaming()) {
-            SecurityTestUtil.enableStreaming(port);
-        }
-        
         port.doubleIt(25);
 
         Client client = ClientProxy.getClient(port);
@@ -176,24 +145,20 @@ public class CachingTest extends AbstractBusClientServerTestBase {
                 SecurityConstants.TOKEN_STORE_CACHE_INSTANCE
             );
         assertNotNull(tokenStore);
-        // We expect two tokens as the identifier + SHA-1 are cached
-        assertEquals(tokenStore.getTokenIdentifiers().size(), 2);
+        // We expect 1 token
+        assertEquals(tokenStore.getTokenIdentifiers().size(), 1);
         
         // Second invocation
         port = service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(port, test.getPort());
+        updateAddressPort(port, PORT);
         
         ((BindingProvider)port).getRequestContext().put(
             SecurityConstants.CACHE_IDENTIFIER, "proxy2"
         );
         ((BindingProvider)port).getRequestContext().put(
-            SecurityConstants.CACHE_CONFIG_FILE, "per-proxy-cache.xml"
+            SecurityConstants.CACHE_CONFIG_FILE, "client/per-proxy-cache.xml"
         );
         
-        if (test.isStreaming()) {
-            SecurityTestUtil.enableStreaming(port);
-        }
-        
         port.doubleIt(35);
 
         client = ClientProxy.getClient(port);
@@ -202,8 +167,8 @@ public class CachingTest extends AbstractBusClientServerTestBase {
                 SecurityConstants.TOKEN_STORE_CACHE_INSTANCE
             );
         assertNotNull(tokenStore);
-        // We expect two tokens as the identifier + SHA-1 are cached
-        assertEquals(tokenStore.getTokenIdentifiers().size(), 2);
+        // We expect 1 token
+        assertEquals(tokenStore.getTokenIdentifiers().size(), 1);
         
         ((java.io.Closeable)port).close();
         bus.shutdown(true);

http://git-wip-us.apache.org/repos/asf/cxf/blob/b8d1d726/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/Server.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/Server.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/Server.java
deleted file mode 100644
index 07ce94c..0000000
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/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.cache;
-
-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/b8d1d726/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/server/Server.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/server/Server.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/server/Server.java
new file mode 100644
index 0000000..7cca824
--- /dev/null
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/server/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.cache.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/b8d1d726/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client.xml
deleted file mode 100644
index 2962f04..0000000
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client.xml
+++ /dev/null
@@ -1,42 +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: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">
-    <cxf:bus>
-        <cxf:features>
-            <p:policies/>
-            <cxf:logging/>
-        </cxf:features>
-    </cxf:bus>
-   
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItCacheSymmetricPort"
createdFromAPI="true">
-        <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
-        </jaxws:properties>
-    </jaxws:client>
-    
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItCachePerProxySymmetricPort"
createdFromAPI="true">
-        <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
-        </jaxws:properties>
-    </jaxws:client>
-
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/b8d1d726/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client/client.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client/client.xml
new file mode 100644
index 0000000..b3284f6
--- /dev/null
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client/client.xml
@@ -0,0 +1,42 @@
+<?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: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">
+    <cxf:bus>
+        <cxf:features>
+            <p:policies/>
+            <cxf:logging/>
+        </cxf:features>
+    </cxf:bus>
+   
+    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItCacheSymmetricPort"
createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+            <entry key="ws-security.encryption.username" value="bob"/>
+        </jaxws:properties>
+    </jaxws:client>
+    
+    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItCachePerProxySymmetricPort"
createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+            <entry key="ws-security.encryption.username" value="bob"/>
+        </jaxws:properties>
+    </jaxws:client>
+
+</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/b8d1d726/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client/per-proxy-cache.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client/per-proxy-cache.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client/per-proxy-cache.xml
new file mode 100644
index 0000000..de11dff
--- /dev/null
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client/per-proxy-cache.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<ehcache xsi:noNamespaceSchemaLocation="ehcache.xsd" updateCheck="false" monitoring="autodetect"
dynamicConfig="true" name="perProxyCache">
+    <diskStore path="java.io.tmpdir"/>
+    <defaultCache maxEntriesLocalHeap="5000" eternal="false" timeToIdleSeconds="3600"
timeToLiveSeconds="3600" overflowToDisk="true" maxElementsOnDisk="10000000" diskPersistent="false"
diskExpiryThreadIntervalSeconds="120" memoryStoreEvictionPolicy="LRU"/>
+    
+    <cache name="org.apache.cxf.ws.security.tokenstore.TokenStore-proxy1" overflowToDisk="false"
maxEntriesLocalHeap="1000" timeToIdleSeconds="3600" timeToLiveSeconds="3600"/>
+    
+    <cache name="org.apache.cxf.ws.security.tokenstore.TokenStore-proxy2" overflowToDisk="false"
maxEntriesLocalHeap="500" timeToIdleSeconds="3600" timeToLiveSeconds="3600"/>
+    
+</ehcache>

http://git-wip-us.apache.org/repos/asf/cxf/blob/b8d1d726/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/per-proxy-cache.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/per-proxy-cache.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/per-proxy-cache.xml
deleted file mode 100644
index de11dff..0000000
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/per-proxy-cache.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<ehcache xsi:noNamespaceSchemaLocation="ehcache.xsd" updateCheck="false" monitoring="autodetect"
dynamicConfig="true" name="perProxyCache">
-    <diskStore path="java.io.tmpdir"/>
-    <defaultCache maxEntriesLocalHeap="5000" eternal="false" timeToIdleSeconds="3600"
timeToLiveSeconds="3600" overflowToDisk="true" maxElementsOnDisk="10000000" diskPersistent="false"
diskExpiryThreadIntervalSeconds="120" memoryStoreEvictionPolicy="LRU"/>
-    
-    <cache name="org.apache.cxf.ws.security.tokenstore.TokenStore-proxy1" overflowToDisk="false"
maxEntriesLocalHeap="1000" timeToIdleSeconds="3600" timeToLiveSeconds="3600"/>
-    
-    <cache name="org.apache.cxf.ws.security.tokenstore.TokenStore-proxy2" overflowToDisk="false"
maxEntriesLocalHeap="500" timeToIdleSeconds="3600" timeToLiveSeconds="3600"/>
-    
-</ehcache>

http://git-wip-us.apache.org/repos/asf/cxf/blob/b8d1d726/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml
deleted file mode 100644
index 1a3a27e..0000000
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml
+++ /dev/null
@@ -1,43 +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/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     ">
-    <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="CacheSymmetric"
address="http://localhost:${testutil.ports.Server}/DoubleItCacheSymmetric" serviceName="s:DoubleItService"
endpointName="s:DoubleItCacheSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl">
-        <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.signature.crypto" value="bob.properties"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-    
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CachePerProxySymmetric"
address="http://localhost:${testutil.ports.Server}/DoubleItCachePerProxySymmetric" serviceName="s:DoubleItService"
endpointName="s:DoubleItCacheSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl">
-        <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.signature.crypto" value="bob.properties"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/b8d1d726/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server/server.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server/server.xml
new file mode 100644
index 0000000..d3dd0ab
--- /dev/null
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server/server.xml
@@ -0,0 +1,43 @@
+<?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/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     ">
+    <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="CacheSymmetric"
address="http://localhost:${testutil.ports.Server}/DoubleItCacheSymmetric" serviceName="s:DoubleItService"
endpointName="s:DoubleItCacheSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl">
+        <jaxws:properties>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.signature.crypto" value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+        </jaxws:properties>
+    </jaxws:endpoint>
+    
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CachePerProxySymmetric"
address="http://localhost:${testutil.ports.Server}/DoubleItCachePerProxySymmetric" serviceName="s:DoubleItService"
endpointName="s:DoubleItCacheSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl">
+        <jaxws:properties>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.signature.crypto" value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+        </jaxws:properties>
+    </jaxws:endpoint>
+
+</beans>


Mime
View raw message