cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1552615 - in /cxf/branches/2.6.x-fixes/systests/ws-rm: ./ src/test/java/org/apache/cxf/systest/ws/rm/sec/ src/test/resources/ src/test/resources/certs/
Date Fri, 20 Dec 2013 12:31:05 GMT
Author: ay
Date: Fri Dec 20 12:31:05 2013
New Revision: 1552615

URL: http://svn.apache.org/r1552615
Log:
add systest for CXF-5405
remove unused pkg imports from test of CXF-5405
fix build in 2.7.x for incompatible test for CXF-5405

Added:
    cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/
    cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java
    cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java
    cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
    cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
    cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/
    cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/alice.properties
    cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/bob.properties
    cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/certs/
    cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/certs/alice.jks
    cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/certs/bob.jks
Modified:
    cxf/branches/2.6.x-fixes/systests/ws-rm/pom.xml

Modified: cxf/branches/2.6.x-fixes/systests/ws-rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/pom.xml?rev=1552615&r1=1552614&r2=1552615&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/ws-rm/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/systests/ws-rm/pom.xml Fri Dec 20 12:31:05 2013
@@ -87,6 +87,12 @@
             <artifactId>cxf-rt-ws-rm</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!--  rt-ws-security dependency is required prior to 3.0.0 -->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-security</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-policy</artifactId>

Added: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java?rev=1552615&view=auto
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java
(added)
+++ cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java
Fri Dec 20 12:31:05 2013
@@ -0,0 +1,70 @@
+/**
+ * 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.rm.sec;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+/**
+ * A CallbackHandler implementation for UsernameTokens.
+ */
+public class UTPasswordCallback implements CallbackHandler {
+    
+    private Map<String, String> passwords = 
+        new HashMap<String, String>();
+    
+    public UTPasswordCallback() {
+        passwords.put("Alice", "ecilA");
+        passwords.put("Frank", "invalid-password");
+        //for MS clients
+        passwords.put("abcd", "dcba");
+        passwords.put("alice", "password");
+        passwords.put("bob", "password");
+    }
+
+    /**
+     * Here, we attempt to get the password from the private 
+     * alias/passwords map.
+     */
+    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
{
+        for (int i = 0; i < callbacks.length; i++) {
+            WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+
+            String pass = passwords.get(pc.getIdentifier());
+            if (pass != null) {
+                pc.setPassword(pass);
+                return;
+            }
+        }
+    }
+    
+    /**
+     * Add an alias/password pair to the callback mechanism.
+     */
+    public void setAliasPassword(String alias, String password) {
+        passwords.put(alias, password);
+    }
+}

Added: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java?rev=1552615&view=auto
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java
(added)
+++ cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java
Fri Dec 20 12:31:05 2013
@@ -0,0 +1,86 @@
+/**
+ * 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.rm.sec;
+
+import java.util.logging.Logger;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.greeter_control.Greeter;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.rm.RMManager;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * Tests the correct interaction of ws-rm calls with ws-security when policy validator verifies
the calls.
+ */
+public class WSRMWithWSSecurityPolicyTest extends AbstractBusClientServerTestBase {
+    public static final String PORT = allocatePort(Server.class); 
+    private static final Logger LOG = LogUtils.getLogger(WSRMWithWSSecurityPolicyTest.class);
+
+    public static class Server extends AbstractBusTestServerBase {
+        protected void run() {
+            SpringBusFactory bf = new SpringBusFactory();
+            Bus bus = bf.createBus("/org/apache/cxf/systest/ws/rm/sec/server-policy.xml");
+            BusFactory.setDefaultBus(bus);
+            setBus(bus);
+        }
+    }
+
+    @BeforeClass
+    public static void startServers() throws Exception {
+        assertTrue("server did not launch correctly", launchServer(Server.class, true));
+    }
+
+    @Test
+    public void testWithSecurityInPolicy() throws Exception {
+        LOG.fine("Creating greeter client");
+
+        ClassPathXmlApplicationContext context = 
+            new ClassPathXmlApplicationContext("org/apache/cxf/systest/ws/rm/sec/client-policy.xml");
+
+        Bus bus = (Bus)context.getBean("bus");
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
+        
+        Greeter greeter = (Greeter)context.getBean("GreeterCombinedClient");
+
+        RMManager manager = bus.getExtension(RMManager.class);
+        boolean empty = manager.getRetransmissionQueue().isEmpty();
+        assertTrue("RetransmissionQueue is not empty", empty);
+        
+        LOG.fine("Invoking greeter");
+        greeter.greetMeOneWay("one");
+
+        Thread.sleep(3000);
+
+        empty = manager.getRetransmissionQueue().isEmpty();
+        assertTrue("RetransmissionQueue not empty", empty);
+
+        context.close();
+    }
+}

Added: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml?rev=1552615&view=auto
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
(added)
+++ cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
Fri Dec 20 12:31:05 2013
@@ -0,0 +1,117 @@
+<?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"
+       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/core http://cxf.apache.org/schemas/core.xsd
+           http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
+           http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd">
+
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+  <cxf:bus bus="bus">
+    <cxf:features>
+      <p:policies/>
+      <cxf:logging/>
+    </cxf:features>
+  </cxf:bus>
+   
+
+  <!--jaxws:client id="GreeterAsymmetricClient" name="{http://cxf.apache.org/greeter_control}GreeterAsymmetricPort"-->
+  <jaxws:client id="GreeterCombinedClient" address="http://localhost:${testutil.ports.Server}/RMGreeterAsymmetric"
serviceClass="org.apache.cxf.greeter_control.Greeter">
+      <jaxws:properties>
+      <entry key="ws-security.username" value="Alice"/>
+      <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.rm.sec.UTPasswordCallback"/>
+      <entry key="ws-security.encryption.properties" value="bob.properties"/>
+      <entry key="ws-security.encryption.username" value="bob"/>
+      <entry key="ws-security.signature.properties" value="alice.properties"/>
+      <entry key="ws-security.signature.username" value="alice"/>
+    </jaxws:properties>
+    <jaxws:features>
+      <p:policies>
+      	<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="#Combined"/>
+      </p:policies>
+    </jaxws:features>
+  </jaxws:client>
+
+  <jaxws:client id="GreeterPlainClient" address="http://localhost:${testutil.ports.Server}/RMGreeterNoSecurity"
serviceClass="org.apache.cxf.greeter_control.Greeter">  
+  </jaxws:client>
+
+  <wsp:Policy xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsp="http://www.w3.org/ns/ws-policy" wsu:Id="Combined">
+    <wsp:All>
+      <wsp:Policy xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsp="http://www.w3.org/ns/ws-policy" wsu:Id="SEC">
+	<wsp:ExactlyOne>
+	  <wsp:All>
+            <sp:AsymmetricBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+              <wsp:Policy>
+		<sp:InitiatorToken>
+		  <wsp:Policy>
+                    <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                      <wsp:Policy>
+			<sp:WssX509V3Token10/>
+                      </wsp:Policy>
+                    </sp:X509Token>
+		  </wsp:Policy>
+		</sp:InitiatorToken>
+		<sp:RecipientToken>
+		  <wsp:Policy>
+                    <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+                      <wsp:Policy>
+			<sp:WssX509V3Token10/>
+			<sp:RequireIssuerSerialReference/>
+                      </wsp:Policy>
+                    </sp:X509Token>
+		  </wsp:Policy>
+		</sp:RecipientToken>
+		<sp:Layout>
+		  <wsp:Policy>
+                    <sp:Lax/>
+		  </wsp:Policy>
+		</sp:Layout>
+		<sp:IncludeTimestamp/>
+		<sp:OnlySignEntireHeadersAndBody/>
+		<sp:AlgorithmSuite>
+		  <wsp:Policy>
+                    <sp:Basic128/>
+		  </wsp:Policy>
+		</sp:AlgorithmSuite>
+              </wsp:Policy>
+            </sp:AsymmetricBinding>
+	  </wsp:All>
+	</wsp:ExactlyOne>
+      </wsp:Policy>
+      <wsp:Policy xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
wsu:Id="RM">
+	<wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata">
+	  <wsp:Policy/>
+	</wsam:Addressing>
+	<wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy">
+	  <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/>
+	</wsrmp:RMAssertion>
+      </wsp:Policy>
+    </wsp:All>
+  </wsp:Policy>
+
+</beans>

Added: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml?rev=1552615&view=auto
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
(added)
+++ cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
Fri Dec 20 12:31:05 2013
@@ -0,0 +1,117 @@
+<?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:jaxws="http://cxf.apache.org/jaxws"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
+       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://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://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.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://cxf.apache.org/greeter_control" id="AsymmetricEndpoint"
address="http://localhost:${testutil.ports.Server}/RMGreeterAsymmetric" serviceName="s:GreeterService"
endpointName="s:GreeterPort" implementor="org.apache.cxf.systest.ws.rm.GreeterImpl">
+    <jaxws:properties>
+      <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.rm.sec.UTPasswordCallback"/>
+      <entry key="ws-security.signature.properties" value="bob.properties"/>
+      <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+      <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
+    </jaxws:properties>
+    <jaxws:features>
+      <p:policies>
+        <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="#Combined"/>
+      </p:policies>
+    </jaxws:features>
+  </jaxws:endpoint>
+
+  <jaxws:endpoint xmlns:s="http://cxf.apache.org/greeter_control" id="NoSecurityEndpoint"
address="http://localhost:${testutil.ports.Server}/RMGreeterNoSecurity" serviceName="s:GreeterService"
endpointName="s:GreeterPort" implementor="org.apache.cxf.systest.ws.rm.GreeterImpl">
+    <jaxws:features>
+      <p:policies>
+      </p:policies>
+    </jaxws:features>
+  </jaxws:endpoint>
+
+  <wsp:Policy xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsp="http://www.w3.org/ns/ws-policy" wsu:Id="Combined">
+    <wsp:All>
+      <wsp:Policy xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsp="http://www.w3.org/ns/ws-policy" wsu:Id="SEC">
+	<wsp:ExactlyOne>
+	  <wsp:All>
+            <sp:AsymmetricBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+              <wsp:Policy>
+		<sp:InitiatorToken>
+		  <wsp:Policy>
+                    <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                      <wsp:Policy>
+			<sp:WssX509V3Token10/>
+                      </wsp:Policy>
+                    </sp:X509Token>
+		  </wsp:Policy>
+		</sp:InitiatorToken>
+		<sp:RecipientToken>
+		  <wsp:Policy>
+                    <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+                      <wsp:Policy>
+			<sp:WssX509V3Token10/>
+			<sp:RequireIssuerSerialReference/>
+                      </wsp:Policy>
+                    </sp:X509Token>
+		  </wsp:Policy>
+		</sp:RecipientToken>
+		<sp:Layout>
+		  <wsp:Policy>
+                    <sp:Lax/>
+		  </wsp:Policy>
+		</sp:Layout>
+		<sp:IncludeTimestamp/>
+		<sp:OnlySignEntireHeadersAndBody/>
+		<sp:AlgorithmSuite>
+		  <wsp:Policy>
+                    <sp:Basic128/>
+		  </wsp:Policy>
+		</sp:AlgorithmSuite>
+              </wsp:Policy>
+            </sp:AsymmetricBinding>
+	  </wsp:All>
+	</wsp:ExactlyOne>
+      </wsp:Policy>
+      <wsp:Policy xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
wsu:Id="RM">
+	<wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata">
+	  <wsp:Policy/>
+	</wsam:Addressing>
+	<wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy">
+	  <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/>
+	</wsrmp:RMAssertion>
+      </wsp:Policy>
+    </wsp:All>
+  </wsp:Policy>
+
+</beans>

Added: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/alice.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/alice.properties?rev=1552615&view=auto
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/alice.properties (added)
+++ cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/alice.properties Fri Dec 20
12:31:05 2013
@@ -0,0 +1,21 @@
+#    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.
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=alice
+org.apache.ws.security.crypto.merlin.keystore.file=certs/alice.jks

Added: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/bob.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/bob.properties?rev=1552615&view=auto
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/bob.properties (added)
+++ cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/bob.properties Fri Dec 20 12:31:05
2013
@@ -0,0 +1,21 @@
+#    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.
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=bob
+org.apache.ws.security.crypto.merlin.keystore.file=certs/bob.jks

Added: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/certs/alice.jks
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/certs/alice.jks?rev=1552615&view=auto
==============================================================================
Files cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/certs/alice.jks (added) and
cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/certs/alice.jks Fri Dec 20 12:31:05
2013 differ

Added: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/certs/bob.jks
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/certs/bob.jks?rev=1552615&view=auto
==============================================================================
Files cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/certs/bob.jks (added) and
cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/resources/certs/bob.jks Fri Dec 20 12:31:05
2013 differ



Mime
View raw message