svn commit: r1500768 [1/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...

[co...@apache.org]

Author: coheigea
Date: Mon Jul  8 14:33:33 2013
New Revision: 1500768

URL: http://svn.apache.org/r1500768
Log:
Security systests refactor - part II

Added:
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxServer.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxServer.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxServer.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxServer.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxServer.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/server/JavaFirstPolicyServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/CustomSaml2Validator.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/CustomSaml2Validator.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxServer.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/XACMLAuthorizingInterceptor.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/XACMLAuthorizingInterceptor.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingServer.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/server/EndorsingServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/CustomStaxUTValidator.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/CustomStaxUTValidator.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/CustomUTValidator.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/CustomUTValidator.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/PolicyServer.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/PolicyServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/ServerDerived.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/ServerDerived.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxServer.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/PingServiceImpl.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/PingServiceImpl.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/DoubleItIntermediaryImpl.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Intermediary.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Intermediary.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Server.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxServer.java
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/javafirstserver.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/endorsing-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/policy-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server-derived.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/intermediary.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
      - copied, changed from r1500684, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/stax-server.xml
Removed:
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/server/JavaFirstPolicyServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/CustomSaml2Validator.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/XACMLAuthorizingInterceptor.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/server/EndorsingServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/CustomStaxUTValidator.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/CustomUTValidator.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/PolicyServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/ServerDerived.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/PingServiceImpl.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/DoubleItIntermediaryImpl.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Intermediary.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/StaxServer.java
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/javafirstserver.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/endorsing-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/policy-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server-derived.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/stax-server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/intermediary.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/stax-server.xml
Modified:
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxGCMTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxHttpsTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxUsernameTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java Mon Jul  8 14:33:33 2013
@@ -26,7 +26,6 @@ import javax.xml.ws.Service;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.systest.ws.action.server.Server;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.example.contract.doubleit.DoubleItPortType;

Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java (from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Server.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Server.java&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Server.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.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.action;
 
 import java.net.URL;
 

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java Mon Jul  8 14:33:33 2013
@@ -26,7 +26,6 @@ import javax.xml.ws.Service;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.systest.ws.algsuite.server.Server;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java Mon Jul  8 14:33:33 2013
@@ -26,7 +26,6 @@ import javax.xml.ws.Service;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.systest.ws.algsuite.server.StaxServer;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java Mon Jul  8 14:33:33 2013
@@ -26,7 +26,6 @@ import javax.xml.ws.Service;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.systest.ws.bindings.server.Server;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java Mon Jul  8 14:33:33 2013
@@ -29,7 +29,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.coverage_checker.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
 import org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java Mon Jul  8 14:33:33 2013
@@ -29,7 +29,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.coverage_checker.server.StaxServer;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
 import org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java Mon Jul  8 14:33:33 2013
@@ -38,7 +38,6 @@ import org.apache.cxf.bus.spring.SpringB
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.jaxws.DispatchImpl;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.fault.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.wss4j.dom.WSConstants;
 import org.example.contract.doubleit.DoubleItPortType;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java Mon Jul  8 14:33:33 2013
@@ -27,7 +27,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.gcm.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxGCMTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxGCMTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxGCMTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxGCMTest.java Mon Jul  8 14:33:33 2013
@@ -27,7 +27,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.gcm.server.StaxServer;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java Mon Jul  8 14:33:33 2013
@@ -34,7 +34,6 @@ import org.apache.cxf.bus.spring.SpringB
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.jaxrs.ext.xml.XMLSource;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.httpget.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
 import org.example.contract.doubleit.DoubleItPortType;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java Mon Jul  8 14:33:33 2013
@@ -27,7 +27,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.https.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxHttpsTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxHttpsTokenTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxHttpsTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxHttpsTokenTest.java Mon Jul  8 14:33:33 2013
@@ -27,7 +27,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.https.server.StaxServer;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java Mon Jul  8 14:33:33 2013
@@ -27,7 +27,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.kerberos.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java Mon Jul  8 14:33:33 2013
@@ -27,7 +27,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.kerberos.server.StaxServer;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java Mon Jul  8 14:33:33 2013
@@ -27,7 +27,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.parts.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
 import org.example.contract.doubleit.DoubleItPortType;

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

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java Mon Jul  8 14:33:33 2013
@@ -41,7 +41,6 @@ import org.apache.cxf.systest.ws.common.
 import org.apache.cxf.systest.ws.policy.javafirst.BindingSimpleService;
 import org.apache.cxf.systest.ws.policy.javafirst.NoAlternativesOperationSimpleService;
 import org.apache.cxf.systest.ws.policy.javafirst.OperationSimpleService;
-import org.apache.cxf.systest.ws.policy.server.JavaFirstPolicyServer;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java Mon Jul  8 14:33:33 2013
@@ -27,7 +27,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.policy.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
 import org.example.contract.doubleit.DoubleItPortType;

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

Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/CustomSaml2Validator.java (from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/CustomSaml2Validator.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/CustomSaml2Validator.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/CustomSaml2Validator.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/CustomSaml2Validator.java&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/CustomSaml2Validator.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/CustomSaml2Validator.java Mon Jul  8 14:33:33 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.systest.ws.saml.server;
+package org.apache.cxf.systest.ws.saml;
 
 import java.util.List;
 

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java Mon Jul  8 14:33:33 2013
@@ -31,7 +31,6 @@ import org.apache.cxf.systest.ws.common.
 import org.apache.cxf.systest.ws.saml.client.SamlCallbackHandler;
 import org.apache.cxf.systest.ws.saml.client.SamlElementCallbackHandler;
 import org.apache.cxf.systest.ws.saml.client.SamlRoleCallbackHandler;
-import org.apache.cxf.systest.ws.saml.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.wss4j.common.saml.bean.KeyInfoBean.CERT_IDENTIFIER;
 import org.apache.wss4j.common.saml.builder.SAML2Constants;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java Mon Jul  8 14:33:33 2013
@@ -31,7 +31,6 @@ import org.apache.cxf.systest.ws.common.
 import org.apache.cxf.systest.ws.saml.client.SamlCallbackHandler;
 import org.apache.cxf.systest.ws.saml.client.SamlElementCallbackHandler;
 import org.apache.cxf.systest.ws.saml.client.SamlRoleCallbackHandler;
-import org.apache.cxf.systest.ws.saml.server.StaxServer;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.wss4j.common.saml.bean.KeyInfoBean.CERT_IDENTIFIER;
 import org.apache.wss4j.common.saml.builder.SAML1Constants;

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

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

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java Mon Jul  8 14:33:33 2013
@@ -27,7 +27,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.spnego.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java Mon Jul  8 14:33:33 2013
@@ -27,7 +27,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.tokens.server.EndorsingServer;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
 import org.example.contract.doubleit.DoubleItPortType;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java Mon Jul  8 14:33:33 2013
@@ -27,7 +27,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.tokens.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
 import org.example.contract.doubleit.DoubleItPortType;

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

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

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

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

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

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxUsernameTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxUsernameTokenTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxUsernameTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxUsernameTokenTest.java Mon Jul  8 14:33:33 2013
@@ -30,7 +30,6 @@ import org.apache.cxf.bus.spring.SpringB
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.ut.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/ut/UsernameTokenDerivedTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java Mon Jul  8 14:33:33 2013
@@ -27,7 +27,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.ut.server.ServerDerived;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
 import org.example.contract.doubleit.DoubleItPortType;

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java Mon Jul  8 14:33:33 2013
@@ -27,7 +27,6 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.ut.server.PolicyServer;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java Mon Jul  8 14:33:33 2013
@@ -30,7 +30,6 @@ import org.apache.cxf.bus.spring.SpringB
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.ut.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/java/org/apache/cxf/systest/ws/wssc/PingServiceImpl.java (from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/PingServiceImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/PingServiceImpl.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/PingServiceImpl.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/PingServiceImpl.java&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/PingServiceImpl.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/PingServiceImpl.java Mon Jul  8 14:33:33 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.systest.ws.wssc.server;
+package org.apache.cxf.systest.ws.wssc;
 
 
 import org.xmlsoap.ping.PingResponseBody;

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

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java?rev=1500768&r1=1500767&r2=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java Mon Jul  8 14:33:33 2013
@@ -26,7 +26,6 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.wssc.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.SecurityConstants;
 

Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java (from r1500684, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/DoubleItIntermediaryImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/DoubleItIntermediaryImpl.java&r1=1500684&r2=1500768&rev=1500768&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/DoubleItIntermediaryImpl.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java Mon Jul  8 14:33:33 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.systest.ws.x509.server;
+package org.apache.cxf.systest.ws.x509;
 
 import java.net.URL;
 
@@ -28,7 +28,6 @@ import javax.xml.ws.Service;
 import javax.xml.ws.WebServiceContext;
 
 import org.apache.cxf.feature.Features;
-import org.apache.cxf.systest.ws.x509.X509TokenTest;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.example.contract.doubleit.DoubleItFault;