You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/07/08 16:33:36 UTC

svn commit: r1500768 [2/2] - in /cxf/trunk/systests/ws-security/src/test: java/org/apache/cxf/systest/ws/action/ java/org/apache/cxf/systest/ws/action/server/ java/org/apache/cxf/systest/ws/algsuite/ java/org/apache/cxf/systest/ws/algsuite/server/ java...

Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Intermediary.java (from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Intermediary.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Intermediary.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Intermediary.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Intermediary.java&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Intermediary.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Intermediary.java Mon Jul  8 14:33:33 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.systest.ws.x509.server;
+package org.apache.cxf.systest.ws.x509;
 
 import java.net.URL;
 

Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Server.java (from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/server/Server.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Server.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Server.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/server/Server.java&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/server/Server.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Server.java Mon Jul  8 14:33:33 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.systest.ws.httpget.server;
+package org.apache.cxf.systest.ws.x509;
 
 import java.net.URL;
 

Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxServer.java (from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/StaxServer.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxServer.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxServer.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/StaxServer.java&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/StaxServer.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxServer.java Mon Jul  8 14:33:33 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.systest.ws.x509.server;
+package org.apache.cxf.systest.ws.x509;
 
 import java.net.URL;
 

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java Mon Jul  8 14:33:33 2013
@@ -35,7 +35,6 @@ import org.apache.cxf.headers.Header;
 import org.apache.cxf.jaxb.JAXBDataBinding;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.systest.ws.ut.SecurityHeaderCacheInterceptor;
-import org.apache.cxf.systest.ws.x509.server.StaxServer;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.example.contract.doubleit.DoubleItPortType;

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java Mon Jul  8 14:33:33 2013
@@ -35,8 +35,6 @@ import org.apache.cxf.headers.Header;
 import org.apache.cxf.jaxb.JAXBDataBinding;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.systest.ws.ut.SecurityHeaderCacheInterceptor;
-import org.apache.cxf.systest.ws.x509.server.Intermediary;
-import org.apache.cxf.systest.ws.x509.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.example.contract.doubleit.DoubleItPortType;

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/stax-server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/stax-server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/stax-server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/stax-server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/stax-server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/stax-server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server/stax-server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server/stax-server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/stax-server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/stax-server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/javafirstserver.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/javafirstserver.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml Mon Jul  8 14:33:33 2013
@@ -135,7 +135,7 @@
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
            <entry key="ws-security.saml2.validator" 
-                  value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>
+                  value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>
        </jaxws:properties> 
      
     </jaxws:endpoint> 
@@ -158,7 +158,7 @@
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
            <entry key="ws-security.saml2.validator" 
-                  value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>
+                  value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>
        </jaxws:properties> 
      
     </jaxws:endpoint> 
@@ -181,7 +181,7 @@
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
            <entry key="ws-security.saml2.validator" 
-                  value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>
+                  value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>
        </jaxws:properties>
        <jaxws:features>
             <p:policies>
@@ -290,7 +290,7 @@
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
            <entry key="ws-security.saml2.validator" 
-                  value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>
+                  value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>
        </jaxws:properties> 
      
     </jaxws:endpoint> 
@@ -332,7 +332,7 @@
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
            <entry key="ws-security.saml2.validator" 
-                  value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>
+                  value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>
        </jaxws:properties> 
      
     </jaxws:endpoint> 
@@ -449,7 +449,7 @@
      
     </jaxws:endpoint> 
     
-    <bean class="org.apache.cxf.systest.ws.saml.server.XACMLAuthorizingInterceptor" 
+    <bean class="org.apache.cxf.systest.ws.saml.XACMLAuthorizingInterceptor" 
          id="XACMLInterceptor">
     </bean>
    
@@ -468,7 +468,7 @@
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
            <entry key="ws-security.saml2.validator" 
-                  value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>
+                  value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>
        </jaxws:properties> 
        <jaxws:inInterceptors>
            <ref bean="XACMLInterceptor"/>

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/stax-server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/stax-server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml Mon Jul  8 14:33:33 2013
@@ -138,7 +138,7 @@
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
            <!--<entry key="ws-security.saml2.validator" 
-                  value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>-->
+                  value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>-->
            <entry key="ws-security.enable.streaming" value="true"/>
        </jaxws:properties> 
      
@@ -162,7 +162,7 @@
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
            <!--<entry key="ws-security.saml2.validator" 
-                  value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>-->
+                  value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>-->
            <entry key="ws-security.enable.streaming" value="true"/>
        </jaxws:properties> 
      
@@ -186,7 +186,7 @@
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
            <!--<entry key="ws-security.saml2.validator" 
-                  value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>-->
+                  value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>-->
            <entry key="ws-security.enable.streaming" value="true"/>
        </jaxws:properties>
        <jaxws:features>
@@ -300,7 +300,7 @@
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
            <!--<entry key="ws-security.saml2.validator" 
-                  value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>-->
+                  value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>-->
            <entry key="ws-security.enable.streaming" value="true"/>
        </jaxws:properties> 
      
@@ -344,7 +344,7 @@
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
            <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
            <!--<entry key="ws-security.saml2.validator" 
-                  value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>-->
+                  value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>-->
            <entry key="ws-security.enable.streaming" value="true"/>
        </jaxws:properties> 
      
@@ -465,7 +465,7 @@
      
     </jaxws:endpoint> 
     
-    <bean class="org.apache.cxf.systest.ws.saml.server.XACMLAuthorizingInterceptor" 
+    <bean class="org.apache.cxf.systest.ws.saml.XACMLAuthorizingInterceptor" 
          id="XACMLInterceptor">
     </bean>
    
@@ -484,7 +484,7 @@
            <entry key="ws-security.signature.properties" 
                   value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
            <!--<entry key="ws-security.saml2.validator" 
-                  value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>-->
+                  value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>-->
            <entry key="ws-security.enable.streaming" value="true"/>
        </jaxws:properties> 
        <jaxws:inInterceptors>

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/endorsing-server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/endorsing-server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/policy-server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/policy-server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server-derived.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server-derived.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml Mon Jul  8 14:33:33 2013
@@ -318,7 +318,7 @@
      
     </jaxws:endpoint> 
     
-    <bean id="subjectValidator" class="org.apache.cxf.systest.ws.ut.server.CustomUTValidator" />
+    <bean id="subjectValidator" class="org.apache.cxf.systest.ws.ut.CustomUTValidator" />
     
     <bean id="authzInterceptor" 
          class="org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor">

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/stax-server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/stax-server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml Mon Jul  8 14:33:33 2013
@@ -328,7 +328,7 @@
      
     </jaxws:endpoint> 
     
-    <bean id="subjectValidator" class="org.apache.cxf.systest.ws.ut.server.CustomStaxUTValidator" />
+    <bean id="subjectValidator" class="org.apache.cxf.systest.ws.ut.CustomStaxUTValidator" />
     
     <bean id="authzInterceptor" 
          class="org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor">

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/intermediary.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/intermediary.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/intermediary.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml Mon Jul  8 14:33:33 2013
@@ -66,7 +66,7 @@
        serviceName="s:DoubleItService"
        endpointName="s:DoubleItPort"
        xmlns:s="http://www.example.org/contract/DoubleIt"
-       implementor="org.apache.cxf.systest.ws.x509.server.DoubleItIntermediaryImpl"
+       implementor="org.apache.cxf.systest.ws.x509.DoubleItIntermediaryImpl"
        wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItIntermediary.wsdl">
         
        <jaxws:properties>

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml (from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/stax-server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/stax-server.xml&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
    (empty)