cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1080341 - in /cxf/trunk: rt/databinding/jibx/ systests/ systests/ws-security/ systests/ws-security/src/ systests/ws-security/src/test/ systests/ws-security/src/test/java/ systests/ws-security/src/test/java/org/ systests/ws-security/src/tes...
Date Thu, 10 Mar 2011 20:41:23 GMT
Author: dkulp
Date: Thu Mar 10 20:41:21 2011
New Revision: 1080341

URL: http://svn.apache.org/viewvc?rev=1080341&view=rev
Log:
Move ws-security system tests into their own module as the ws-specs module was beginning to take a lot of time.

Added:
    cxf/trunk/systests/ws-security/   (with props)
    cxf/trunk/systests/ws-security/pom.xml   (with props)
    cxf/trunk/systests/ws-security/src/
    cxf/trunk/systests/ws-security/src/test/
    cxf/trunk/systests/ws-security/src/test/java/
    cxf/trunk/systests/ws-security/src/test/java/org/
    cxf/trunk/systests/ws-security/src/test/java/org/apache/
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/
      - copied from r1080328, cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/
      - copied from r1080328, cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssc/
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/
      - copied from r1080328, cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/
      - copied from r1080328, cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/
    cxf/trunk/systests/ws-security/src/test/resources/
    cxf/trunk/systests/ws-security/src/test/resources/log4j.properties   (with props)
    cxf/trunk/systests/ws-security/src/test/resources/logging.properties   (with props)
    cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/
    cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/DoubleIt.wsdl
      - copied unchanged from r1080328, cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl
    cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/wssc/
      - copied from r1080328, cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssc/
    cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/wssec10/
      - copied from r1080328, cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/
    cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/wssec11/
      - copied from r1080328, cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/
Removed:
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssc/
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/
    cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl
    cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssc/
    cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/
    cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/
Modified:
    cxf/trunk/rt/databinding/jibx/   (props changed)
    cxf/trunk/systests/pom.xml
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.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/wssec10/server/MutualCertificate10SignEncrypt.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRestricted.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRsa15TripleDes.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRsa15TripleDesRestricted.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UserNameOverTransport.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UserNameOverTransportRestricted.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java
    cxf/trunk/systests/ws-specs/pom.xml

Propchange: cxf/trunk/rt/databinding/jibx/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 10 20:41:21 2011
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+eclipse-classes
+.settings
+.classpath
+.project
+.wtpmodules
+

Modified: cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/pom.xml?rev=1080341&r1=1080340&r2=1080341&view=diff
==============================================================================
--- cxf/trunk/systests/pom.xml (original)
+++ cxf/trunk/systests/pom.xml Thu Mar 10 20:41:21 2011
@@ -39,6 +39,7 @@
         <module>databinding</module>
         <module>jaxrs</module>
         <module>ws-specs</module>
+        <module>ws-security</module>
         <module>wsdl_maven</module>
     </modules>
 

Propchange: cxf/trunk/systests/ws-security/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 10 20:41:21 2011
@@ -0,0 +1,11 @@
+.pmd
+.checkstyle
+.ruleset
+target
+eclipse-classes
+.settings
+.classpath
+.project
+.wtpmodules
+
+

Added: cxf/trunk/systests/ws-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/pom.xml?rev=1080341&view=auto
==============================================================================
--- cxf/trunk/systests/ws-security/pom.xml (added)
+++ cxf/trunk/systests/ws-security/pom.xml Thu Mar 10 20:41:21 2011
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>cxf-parent</artifactId>
+        <groupId>org.apache.cxf</groupId>
+        <version>2.4.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf.systests</groupId>
+    <artifactId>cxf-systests-ws-security</artifactId>
+    <name>Apache CXF WS-Security System Tests</name>
+    <version>2.4.0-SNAPSHOT</version>
+    <url>http://cxf.apache.org</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-codegen-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-test-sources</id>
+                        <phase>generate-test-sources</phase>
+                        <configuration>
+                            <fork>${cxf.codegenplugin.forkmode}</fork>
+                            <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
+                            <testWsdlRoot>${basedir}/src/test/resources/wsdl_systest_wssec</testWsdlRoot>
+                            <wsdlOptions>
+                                <wsdlOption>
+                                    <wsdl>${basedir}/src/test/resources/wsdl_systest_wssec/wssec10/WsSecurity10.wsdl</wsdl>
+                                </wsdlOption>
+                                <wsdlOption>
+                                    <wsdl>${basedir}/src/test/resources/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl</wsdl>
+                                </wsdlOption>
+                                <wsdlOption>
+                                    <wsdl>${basedir}/src/test/resources/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl</wsdl>
+                                </wsdlOption>
+                            </wsdlOptions>
+                        </configuration>
+                        <goals>
+                            <goal>wsdl2java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>${cxf.servlet-api.group}</groupId>
+            <artifactId>${cxf.servlet-api.artifact}</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-common-utilities</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-databinding-jaxb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-bindings-soap</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http-jetty</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-addr</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-policy</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-security</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-testutils</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+             <groupId>com.sun.xml.fastinfoset</groupId>
+             <artifactId>FastInfoset</artifactId>
+         </dependency>
+
+    </dependencies>
+    <properties>
+        <cxf.surefire.fork.mode>pertest</cxf.surefire.fork.mode>
+    </properties>
+    <profiles>
+        <profile>
+            <id>jaxws22</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+</project>

Propchange: cxf/trunk/systests/ws-security/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/ws-security/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/ws-security/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java?rev=1080341&r1=1080328&r2=1080341&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java Thu Mar 10 20:41:21 2011
@@ -385,7 +385,7 @@ public class SecurityPolicyTest extends 
                 portName = "DoubleItPortHttp",
                 serviceName = "DoubleItService", 
                 endpointInterface = "org.apache.cxf.policytest.doubleit.DoubleItPortType",
-                wsdlLocation = "classpath:/wsdl_systest_wsspec/DoubleIt.wsdl")
+                wsdlLocation = "classpath:/wsdl_systest_wssec/DoubleIt.wsdl")
     public static class DoubleItImpl extends AbstractDoubleItImpl {
     }
     
@@ -393,7 +393,7 @@ public class SecurityPolicyTest extends 
                 portName = "DoubleItPortHttps",
                 serviceName = "DoubleItService", 
                 endpointInterface = "org.apache.cxf.policytest.doubleit.DoubleItPortType",
-                wsdlLocation = "classpath:/wsdl_systest_wsspec/DoubleIt.wsdl")
+                wsdlLocation = "classpath:/wsdl_systest_wssec/DoubleIt.wsdl")
     public static class DoubleItImplHttps extends AbstractDoubleItImpl {
     }
     
@@ -401,7 +401,7 @@ public class SecurityPolicyTest extends 
                 portName = "DoubleItPortEncryptThenSign",
                 serviceName = "DoubleItService", 
                 endpointInterface = "org.apache.cxf.policytest.doubleit.DoubleItPortType",
-                wsdlLocation = "classpath:/wsdl_systest_wsspec/DoubleIt.wsdl")
+                wsdlLocation = "classpath:/wsdl_systest_wssec/DoubleIt.wsdl")
     public static class DoubleItImplEncryptThenSign extends AbstractDoubleItImpl {
     }
     
@@ -409,7 +409,7 @@ public class SecurityPolicyTest extends 
                 portName = "DoubleItPortSignThenEncrypt",
                 serviceName = "DoubleItService", 
                 endpointInterface = "org.apache.cxf.policytest.doubleit.DoubleItPortType",
-                wsdlLocation = "classpath:/wsdl_systest_wsspec/DoubleIt.wsdl")
+                wsdlLocation = "classpath:/wsdl_systest_wssec/DoubleIt.wsdl")
     public static class DoubleItImplSignThenEncrypt extends AbstractDoubleItImpl {
     }
     
@@ -417,7 +417,7 @@ public class SecurityPolicyTest extends 
                 portName = "DoubleItPortSign",
                 serviceName = "DoubleItService", 
                 endpointInterface = "org.apache.cxf.policytest.doubleit.DoubleItPortType",
-                wsdlLocation = "classpath:/wsdl_systest_wsspec/DoubleIt.wsdl")
+                wsdlLocation = "classpath:/wsdl_systest_wssec/DoubleIt.wsdl")
     public static class DoubleItImplSign extends AbstractDoubleItImpl {
     }
     
@@ -425,7 +425,7 @@ public class SecurityPolicyTest extends 
                 portName = "DoubleItPortXPath",
                 serviceName = "DoubleItService", 
                 endpointInterface = "org.apache.cxf.policytest.doubleit.DoubleItPortType",
-                wsdlLocation = "classpath:/wsdl_systest_wsspec/DoubleIt.wsdl")
+                wsdlLocation = "classpath:/wsdl_systest_wssec/DoubleIt.wsdl")
     public static class DoubleItImplXPath extends AbstractDoubleItImpl {
     }
     
@@ -433,14 +433,14 @@ public class SecurityPolicyTest extends 
                 portName = "DoubleItPortSignedOnly",
                 serviceName = "DoubleItService", 
                 endpointInterface = "org.apache.cxf.policytest.doubleit.DoubleItPortType",
-                wsdlLocation = "classpath:/wsdl_systest_wsspec/DoubleIt.wsdl")
+                wsdlLocation = "classpath:/wsdl_systest_wssec/DoubleIt.wsdl")
     public static class DoubleItImplSignOnly extends AbstractDoubleItImpl {
     }
     
     @WebServiceProvider(targetNamespace = "http://cxf.apache.org/policytest/DoubleIt", 
                         portName = "DoubleItPortSignThenEncrypt",
                         serviceName = "DoubleItService", 
-                        wsdlLocation = "classpath:/wsdl_systest_wsspec/DoubleIt.wsdl") 
+                        wsdlLocation = "classpath:/wsdl_systest_wssec/DoubleIt.wsdl") 
     @ServiceMode(value = Mode.PAYLOAD)
     public static class DoubleItProvider implements Provider<Source> {
 
@@ -475,7 +475,7 @@ public class SecurityPolicyTest extends 
                 portName = "DoubleItPortCXF3041",
                 serviceName = "DoubleItService", 
                 endpointInterface = "org.apache.cxf.policytest.doubleit.DoubleItPortType",
-                wsdlLocation = "classpath:/wsdl_systest_wsspec/DoubleIt.wsdl")
+                wsdlLocation = "classpath:/wsdl_systest_wssec/DoubleIt.wsdl")
     public static class DoubleItImplCXF3041 extends AbstractDoubleItImpl {
     }
     
@@ -483,7 +483,7 @@ public class SecurityPolicyTest extends 
                 portName = "DoubleItPortCXF3042",
                 serviceName = "DoubleItService", 
                 endpointInterface = "org.apache.cxf.policytest.doubleit.DoubleItPortType",
-                wsdlLocation = "classpath:/wsdl_systest_wsspec/DoubleIt.wsdl")
+                wsdlLocation = "classpath:/wsdl_systest_wssec/DoubleIt.wsdl")
     public static class DoubleItImplCXF3042 extends AbstractDoubleItImpl {
     }
     

Modified: 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/Server.java?rev=1080341&r1=1080328&r2=1080341&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/Server.java Thu Mar 10 20:41:21 2011
@@ -131,7 +131,7 @@ public class Server extends AbstractBusT
                 serviceName = "PingService", 
                 portName = "SecureConversation_MutualCertificate10SignEncrypt_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class SCMCSEIPingService extends PingServiceImpl {
     }
 
@@ -139,42 +139,42 @@ public class Server extends AbstractBusT
                 serviceName = "PingService", 
                 portName = "AC_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class ACIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "ADC_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class ADCIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "ADC-ES_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class ADCESIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "_A_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class AIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "_AD_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class ADIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "_AD-ES_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class ADESIPingService extends PingServiceImpl {
     }
 
@@ -183,42 +183,42 @@ public class Server extends AbstractBusT
                 serviceName = "PingService", 
                 portName = "UXC_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class UXCIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "UXDC_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class UXDCIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "UXDC-SEES_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class UXDCSEESIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "_UX_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class UXIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "_UXD_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class UXDIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "_UXD-SEES_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class UXDSEESIPingService extends PingServiceImpl {
     }
 
@@ -226,35 +226,35 @@ public class Server extends AbstractBusT
                 serviceName = "PingService", 
                 portName = "XC_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class XCIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "XDC_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class XDCIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "XDC_IPingService1", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class XDC1IPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "XDC-ES_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class XDCESIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "XDC-SEES_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class XDCSEESIPingService extends PingServiceImpl {
     }
     
@@ -262,35 +262,35 @@ public class Server extends AbstractBusT
                 serviceName = "PingService", 
                 portName = "_X_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class XIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "_X10_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class X10IPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "_XD_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class XDIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "_XD-SEES_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class XDSEESIPingService extends PingServiceImpl {
     }
     @WebService(targetNamespace = "http://WSSec/wssc", 
                 serviceName = "PingService", 
                 portName = "_XD-ES_IPingService", 
                 endpointInterface = "wssec.wssc.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl")
     public static class XDESIPingService extends PingServiceImpl {
     }
 }

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncrypt.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncrypt.java?rev=1080341&r1=1080328&r2=1080341&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncrypt.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncrypt.java Thu Mar 10 20:41:21 2011
@@ -23,7 +23,7 @@ package org.apache.cxf.systest.ws.wssec1
     serviceName = "PingService", 
     portName = "MutualCertificate10SignEncrypt_IPingService", 
     endpointInterface = "wssec.wssec10.IPingService",
-    wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec10/WsSecurity10.wsdl"
+    wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec10/WsSecurity10.wsdl"
 )                  
 public class MutualCertificate10SignEncrypt extends PingServiceBase {
     // complete

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRestricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRestricted.java?rev=1080341&r1=1080328&r2=1080341&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRestricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRestricted.java Thu Mar 10 20:41:21 2011
@@ -23,7 +23,7 @@ package org.apache.cxf.systest.ws.wssec1
     serviceName = "PingService", 
     portName = "MutualCertificate10SignEncrypt_IPingService", 
     endpointInterface = "wssec.wssec10.IPingService",
-    wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec10/WsSecurity10_restricted.wsdl"
+    wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec10/WsSecurity10_restricted.wsdl"
 )                  
 public class MutualCertificate10SignEncryptRestricted extends PingServiceBase {
     // complete

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRsa15TripleDes.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRsa15TripleDes.java?rev=1080341&r1=1080328&r2=1080341&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRsa15TripleDes.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRsa15TripleDes.java Thu Mar 10 20:41:21 2011
@@ -23,7 +23,7 @@ package org.apache.cxf.systest.ws.wssec1
     serviceName = "PingService", 
     portName = "MutualCertificate10SignEncryptRsa15TripleDes_IPingService", 
     endpointInterface = "wssec.wssec10.IPingService",
-    wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec10/WsSecurity10.wsdl"
+    wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec10/WsSecurity10.wsdl"
 )                  
 public class MutualCertificate10SignEncryptRsa15TripleDes extends PingServiceBase {
     // complete

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRsa15TripleDesRestricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRsa15TripleDesRestricted.java?rev=1080341&r1=1080328&r2=1080341&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRsa15TripleDesRestricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/MutualCertificate10SignEncryptRsa15TripleDesRestricted.java Thu Mar 10 20:41:21 2011
@@ -23,7 +23,7 @@ package org.apache.cxf.systest.ws.wssec1
     serviceName = "PingService", 
     portName = "MutualCertificate10SignEncryptRsa15TripleDes_IPingService", 
     endpointInterface = "wssec.wssec10.IPingService",
-    wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec10/WsSecurity10_restricted.wsdl"
+    wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec10/WsSecurity10_restricted.wsdl"
 )                  
 public class MutualCertificate10SignEncryptRsa15TripleDesRestricted extends PingServiceBase {
     // complete

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UserNameOverTransport.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UserNameOverTransport.java?rev=1080341&r1=1080328&r2=1080341&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UserNameOverTransport.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UserNameOverTransport.java Thu Mar 10 20:41:21 2011
@@ -23,7 +23,7 @@ package org.apache.cxf.systest.ws.wssec1
     serviceName = "PingService", 
     portName = "UserNameOverTransportLocal_IPingService", 
     endpointInterface = "wssec.wssec10.IPingService",
-    wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec10/WsSecurity10.wsdl"
+    wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec10/WsSecurity10.wsdl"
 )                  
 public class UserNameOverTransport extends PingServiceBase {
     // complete

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UserNameOverTransportRestricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UserNameOverTransportRestricted.java?rev=1080341&r1=1080328&r2=1080341&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UserNameOverTransportRestricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UserNameOverTransportRestricted.java Thu Mar 10 20:41:21 2011
@@ -23,7 +23,7 @@ package org.apache.cxf.systest.ws.wssec1
     serviceName = "PingService", 
     portName = "UserNameOverTransportLocal_IPingService", 
     endpointInterface = "wssec.wssec10.IPingService",
-    wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec10/WsSecurity10_restricted.wsdl"
+    wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec10/WsSecurity10_restricted.wsdl"
 )                  
 public class UserNameOverTransportRestricted extends PingServiceBase {
     // complete

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml?rev=1080341&r1=1080328&r2=1080341&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml Thu Mar 10 20:41:21 2011
@@ -95,7 +95,7 @@
        address="http://localhost:${testutil.ports.AuthorizedServer}/UserName" 
        serviceName="interop:PingService"
        endpointName="interop:UserName_IPingService"
-       wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec10/WsSecurity10_12_restricted_hashed.wsdl"
+       wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec10/WsSecurity10_12_restricted_hashed.wsdl"
        implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted">
         
        <jaxws:inInterceptors>
@@ -109,7 +109,7 @@
        address="http://localhost:${testutil.ports.AuthorizedServer}/HashedUserName" 
        serviceName="interop:PingService"
        endpointName="interop:UserName_IPingService_hashed"
-       wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec10/WsSecurity10_12_restricted_hashed.wsdl"
+       wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec10/WsSecurity10_12_restricted_hashed.wsdl"
        implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted">
         
        <jaxws:inInterceptors>

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java?rev=1080341&r1=1080328&r2=1080341&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java Thu Mar 10 20:41:21 2011
@@ -91,7 +91,7 @@ public class Server extends AbstractBusT
                 serviceName = "PingService11", 
                 portName = "A_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class APingService extends PingService {
     }
     
@@ -99,7 +99,7 @@ public class Server extends AbstractBusT
                 serviceName = "PingService11", 
                 portName = "A-NoTimestamp_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class ANoTimestampPingService extends PingService {
     }
 
@@ -107,21 +107,21 @@ public class Server extends AbstractBusT
                 serviceName = "PingService11", 
                 portName = "AD_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class ADPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
                 serviceName = "PingService11", 
                 portName = "A-ES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class AESPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
                 serviceName = "PingService11", 
                 portName = "AD-ES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class ADESPingService extends PingService {
     }
 
@@ -129,14 +129,14 @@ public class Server extends AbstractBusT
                 serviceName = "PingService11", 
                 portName = "UX_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class UXPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
                 serviceName = "PingService11", 
                 portName = "UX-NoTimestamp_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class UXNoTimestampPingService extends PingService {
     }
 
@@ -144,7 +144,7 @@ public class Server extends AbstractBusT
                 serviceName = "PingService11", 
                 portName = "UXD_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class UXDPingService extends PingService {
     }
 
@@ -152,14 +152,14 @@ public class Server extends AbstractBusT
                 serviceName = "PingService11", 
                 portName = "UX-SEES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class UXSEESPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
                 serviceName = "PingService11", 
                 portName = "UXD-SEES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class UXDSEESPingService extends PingService {
     }
 
@@ -169,14 +169,14 @@ public class Server extends AbstractBusT
                 serviceName = "PingService11", 
                 portName = "X_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class XPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
                 serviceName = "PingService11", 
                 portName = "X-NoTimestamp_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class XNoTimestampPingService extends PingService {
     }
 
@@ -184,7 +184,7 @@ public class Server extends AbstractBusT
                 serviceName = "PingService11", 
                 portName = "XD_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class XDPingService extends PingService {
     }
 
@@ -192,35 +192,35 @@ public class Server extends AbstractBusT
                 serviceName = "PingService11", 
                 portName = "XD-ES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class XDESPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
                 serviceName = "PingService11", 
                 portName = "XD-SEES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class XDSEESPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
                 serviceName = "PingService11", 
                 portName = "X-AES128_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class XAES128PingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
                 serviceName = "PingService11", 
                 portName = "X-AES256_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class XAES256PingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
                 serviceName = "PingService11", 
                 portName = "X-TripleDES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")        
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11.wsdl")        
     public static class XTripleDESPingService extends PingService {
     }
 

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java?rev=1080341&r1=1080328&r2=1080341&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java Thu Mar 10 20:41:21 2011
@@ -91,7 +91,7 @@ public class ServerRestricted extends Ab
                 serviceName = "PingService11", 
                 portName = "A_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class APingService extends PingService {
     }
     
@@ -99,7 +99,7 @@ public class ServerRestricted extends Ab
                 serviceName = "PingService11", 
                 portName = "A-NoTimestamp_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
-                wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                wsdlLocation = "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class ANoTimestampPingService extends PingService {
     }
 
@@ -108,7 +108,7 @@ public class ServerRestricted extends Ab
                 portName = "AD_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class ADPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
@@ -116,7 +116,7 @@ public class ServerRestricted extends Ab
                 portName = "A-ES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class AESPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
@@ -124,7 +124,7 @@ public class ServerRestricted extends Ab
                 portName = "AD-ES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class ADESPingService extends PingService {
     }
 
@@ -133,7 +133,7 @@ public class ServerRestricted extends Ab
                 portName = "UX_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class UXPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
@@ -141,7 +141,7 @@ public class ServerRestricted extends Ab
                 portName = "UX-NoTimestamp_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class UXNoTimestampPingService extends PingService {
     }
 
@@ -150,7 +150,7 @@ public class ServerRestricted extends Ab
                 portName = "UXD_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class UXDPingService extends PingService {
     }
 
@@ -159,7 +159,7 @@ public class ServerRestricted extends Ab
                 portName = "UX-SEES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class UXSEESPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
@@ -167,7 +167,7 @@ public class ServerRestricted extends Ab
                 portName = "UXD-SEES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class UXDSEESPingService extends PingService {
     }
 
@@ -178,7 +178,7 @@ public class ServerRestricted extends Ab
                 portName = "X_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class XPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
@@ -186,7 +186,7 @@ public class ServerRestricted extends Ab
                 portName = "X-NoTimestamp_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class XNoTimestampPingService extends PingService {
     }
 
@@ -195,7 +195,7 @@ public class ServerRestricted extends Ab
                 portName = "XD_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class XDPingService extends PingService {
     }
 
@@ -204,7 +204,7 @@ public class ServerRestricted extends Ab
                 portName = "XD-ES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class XDESPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
@@ -212,7 +212,7 @@ public class ServerRestricted extends Ab
                 portName = "XD-SEES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class XDSEESPingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
@@ -220,7 +220,7 @@ public class ServerRestricted extends Ab
                 portName = "X-AES128_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class XAES128PingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
@@ -228,7 +228,7 @@ public class ServerRestricted extends Ab
                 portName = "X-AES256_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class XAES256PingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
@@ -236,7 +236,7 @@ public class ServerRestricted extends Ab
                 portName = "X-TripleDES_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
-                              "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
+                              "target/test-classes/wsdl_systest_wssec/wssec11/WsSecurity11_restricted.wsdl")
     public static class XTripleDESPingService extends PingService {
     }
 

Added: cxf/trunk/systests/ws-security/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/log4j.properties?rev=1080341&view=auto
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/log4j.properties (added)
+++ cxf/trunk/systests/ws-security/src/test/resources/log4j.properties Thu Mar 10 20:41:21 2011
@@ -0,0 +1,30 @@
+#
+#
+#    Licensed to the Apache Software Foundation (ASF) under one
+#    or more contributor license agreements. See the NOTICE file
+#    distributed with this work for additional information
+#    regarding copyright ownership. The ASF licenses this file
+#    to you under the Apache License, Version 2.0 (the
+#    "License"); you may not use this file except in compliance
+#    with the License. You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing,
+#    software distributed under the License is distributed on an
+#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied. See the License for the
+#    specific language governing permissions and limitations
+#    under the License.
+#
+#
+
+# Global logging configuration
+log4j.rootLogger=WARN, stdout
+
+log4j.logger.org.springframework.security=DEBUG, stdout
+
+# Console output...
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%t] %m%n

Propchange: cxf/trunk/systests/ws-security/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/ws-security/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/ws-security/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/systests/ws-security/src/test/resources/logging.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/logging.properties?rev=1080341&view=auto
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/logging.properties (added)
+++ cxf/trunk/systests/ws-security/src/test/resources/logging.properties Thu Mar 10 20:41:21 2011
@@ -0,0 +1,74 @@
+#
+#
+#    Licensed to the Apache Software Foundation (ASF) under one
+#    or more contributor license agreements. See the NOTICE file
+#    distributed with this work for additional information
+#    regarding copyright ownership. The ASF licenses this file
+#    to you under the Apache License, Version 2.0 (the
+#    "License"); you may not use this file except in compliance
+#    with the License. You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing,
+#    software distributed under the License is distributed on an
+#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied. See the License for the
+#    specific language governing permissions and limitations
+#    under the License.
+#
+#
+############################################################
+#  	Default Logging Configuration File
+#
+# You can use a different file by specifying a filename
+# with the java.util.logging.config.file system property.  
+# For example java -Djava.util.logging.config.file=myfile
+############################################################
+
+############################################################
+#  	Global properties
+############################################################
+
+# "handlers" specifies a comma separated list of log Handler 
+# classes.  These handlers will be installed during VM startup.
+# Note that these classes must be on the system classpath.
+# By default we only configure a ConsoleHandler, which will only
+# show messages at the INFO and above levels.
+#handlers= java.util.logging.ConsoleHandler
+
+# To also add the FileHandler, use the following line instead.
+#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+
+# Default global logging level.
+# This specifies which kinds of events are logged across
+# all loggers.  For any given facility this global level
+# can be overriden by a facility specific level
+# Note that the ConsoleHandler also has a separate level
+# setting to limit messages printed to the console.
+.level= WARNING
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+# default file output is in user's home directory.
+java.util.logging.FileHandler.pattern = %h/java%u.log
+java.util.logging.FileHandler.limit = 50000
+java.util.logging.FileHandler.count = 1
+java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
+
+# Limit the message that are printed on the console to INFO and above.
+java.util.logging.ConsoleHandler.level = WARNING
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+# For example, set the com.xyz.foo logger to only log SEVERE
+# messages:
+#com.xyz.foo.level = SEVERE

Propchange: cxf/trunk/systests/ws-security/src/test/resources/logging.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/ws-security/src/test/resources/logging.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/ws-security/src/test/resources/logging.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: cxf/trunk/systests/ws-specs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/pom.xml?rev=1080341&r1=1080340&r2=1080341&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/pom.xml (original)
+++ cxf/trunk/systests/ws-specs/pom.xml Thu Mar 10 20:41:21 2011
@@ -48,15 +48,6 @@
                                 <wsdlOption>
                                     <wsdl>${basedir}/src/test/resources/wsdl_systest_wsspec/addr-jaxwsmm.wsdl</wsdl>
                                 </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/wsdl_systest_wsspec/wssc/WSSecureConversation.wsdl</wsdl>
-                                </wsdlOption>
                             </wsdlOptions>
                         </configuration>
                         <goals>
@@ -157,11 +148,11 @@
             <artifactId>cxf-rt-ws-policy</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>



Mime
View raw message