svn commit: r1006323 - in /cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security: ./ src/test/java/org/apache/cxf/systest/security/ src/test/resources/security_jms_custom_headers/

[veithen]

Author: veithen
Date: Sun Oct 10 17:32:50 2010
New Revision: 1006323

URL: http://svn.apache.org/viewvc?rev=1006323&view=rev
Log:
Sandbox: make the Spring Security systests work with the latest 2.3.0-SNAPSHOT.

Modified:
    cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/pom.xml
    
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/java/org/apache/cxf/systest/security/AbstractSpringServer.java
    
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/java/org/apache/cxf/systest/security/JMSCustomHeadersTest.java
    
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/resources/security_jms_custom_headers/applicationContext.xml

Modified: 
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/pom.xml?rev=1006323&r1=1006322&r2=1006323&view=diff
==============================================================================
--- 
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/pom.xml 
(original)
+++ 
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/pom.xml 
Sun Oct 10 17:32:50 2010
@@ -78,6 +78,14 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+        </dependency>
         
         <!-- Required by in-memory user details service -->
         <dependency>

Modified: 
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/java/org/apache/cxf/systest/security/AbstractSpringServer.java
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/java/org/apache/cxf/systest/security/AbstractSpringServer.java?rev=1006323&r1=1006322&r2=1006323&view=diff
==============================================================================
--- 
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/java/org/apache/cxf/systest/security/AbstractSpringServer.java
 (original)
+++ 
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/java/org/apache/cxf/systest/security/AbstractSpringServer.java
 Sun Oct 10 17:32:50 2010
@@ -23,28 +23,34 @@ import java.net.URISyntaxException;
 
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.handler.DefaultHandler;
+import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
 
 // Note: Code copied from cxf-systests-jaxrs
 public abstract class AbstractSpringServer extends AbstractBusTestServerBase {
+    // TODO: need to figure out how to get the dynamically allocated port in 
the test cases
+    public static final String PORT = "9080";
+//    public static final String PORT = 
allocatePort(AbstractSpringServer.class);
 
-    private org.mortbay.jetty.Server server;
+    private org.eclipse.jetty.server.Server server;
     private String resourcePath;
     private String contextPath;
     private int port;
     
     protected AbstractSpringServer(String path) {
-        this(path, "/", 9080);
+        this(path, "/", Integer.parseInt(PORT));
     }
     
     protected AbstractSpringServer(String path, int portNumber) {
         this(path, "/", portNumber);
     }
+    protected AbstractSpringServer(String path, String cPath) {
+        this(path, cPath, Integer.parseInt(PORT));
+    }
     
     protected AbstractSpringServer(String path, String cPath, int portNumber) {
         resourcePath = path;
@@ -55,7 +61,7 @@ public abstract class AbstractSpringServ
     protected void run() {
         System.out.println("Starting Server");
 
-        server = new org.mortbay.jetty.Server();
+        server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(port);

Modified: 
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/java/org/apache/cxf/systest/security/JMSCustomHeadersTest.java
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/java/org/apache/cxf/systest/security/JMSCustomHeadersTest.java?rev=1006323&r1=1006322&r2=1006323&view=diff
==============================================================================
--- 
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/java/org/apache/cxf/systest/security/JMSCustomHeadersTest.java
 (original)
+++ 
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/java/org/apache/cxf/systest/security/JMSCustomHeadersTest.java
 Sun Oct 10 17:32:50 2010
@@ -49,7 +49,7 @@ public class JMSCustomHeadersTest extend
 
     private Calculator createClient(String user, String password) {
         JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
-        
factory.setTransportId(JMSSpecConstants.SOAP_JMS_SPECIFICIATION_TRANSPORTID);
+        
factory.setTransportId(JMSSpecConstants.SOAP_JMS_SPECIFICATION_TRANSPORTID);
         factory.setServiceClass(Calculator.class);
         factory.setAddress(address);
         Calculator client = (Calculator)factory.create();

Modified: 
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/resources/security_jms_custom_headers/applicationContext.xml
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/resources/security_jms_custom_headers/applicationContext.xml?rev=1006323&r1=1006322&r2=1006323&view=diff
==============================================================================
--- 
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/resources/security_jms_custom_headers/applicationContext.xml
 (original)
+++ 
cxf/sandbox/veithen/cxf-spring-security/cxf-systests-spring-security/src/test/resources/security_jms_custom_headers/applicationContext.xml
 Sun Oct 10 17:32:50 2010
@@ -45,7 +45,7 @@
     <jaxws:endpoint id="endpoint"
                     
implementor="org.apache.cxf.systest.security.CalculatorImpl"
                     
address="jms:jndi:dynamicQueues/calculator?jndiInitialContextFactory=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;jndiConnectionFactoryName=ConnectionFactory&amp;jndiURL=vm://broker1%3Fmarshal=false%26broker.persistent=false"
-                    transportId="http://www.w3.org/2008/07/soap/bindings/JMS/";>
+                    transportId="http://www.w3.org/2010/soapjms/";>
         <jaxws:inInterceptors>
             <ssec:generic-username-password-interceptor usernameHeader="user" 
passwordHeader="password"/>
             <ssec:soap-authentication-interceptor/>