cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [19/19] git commit: Fix samples compiling with Jetty9
Date Thu, 30 Oct 2014 19:29:08 GMT
Fix samples compiling with Jetty9


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fb94440f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fb94440f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fb94440f

Branch: refs/heads/master
Commit: fb94440f6f1d5c7c572b6c0163f275c95073b8ee
Parents: 7ad6303
Author: Daniel Kulp <dkulp@apache.org>
Authored: Thu Oct 30 15:26:33 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu Oct 30 15:26:33 2014 -0400

----------------------------------------------------------------------
 .../src/main/java/demo/spring/servlet/Server.java            | 8 +-------
 .../src/main/java/demo/spring/service/Server.java            | 8 +-------
 .../src/main/java/demo/jaxrs/servlet/Server.java             | 8 +-------
 .../logbrowser/src/main/java/demo/service/Server.java        | 7 +------
 .../src/main/java/demo/spring/service/Server.java            | 8 +-------
 5 files changed, 5 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/fb94440f/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
index e3f0ff9..d50ee8c 100644
--- a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
+++ b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
@@ -18,11 +18,9 @@
  */
 package demo.spring.servlet;
 
-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;
 
 public class Server {
@@ -37,11 +35,7 @@ public class Server {
          * as a convenience so you do not need to configure your servlet
          * container to see CXF in action!
          */
-        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
-
-        SelectChannelConnector connector = new SelectChannelConnector();
-        connector.setPort(9002);
-        server.setConnectors(new Connector[] {connector});
+        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9002);
 
         WebAppContext webappcontext = new WebAppContext();
         webappcontext.setContextPath("/");

http://git-wip-us.apache.org/repos/asf/cxf/blob/fb94440f/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
index aa5c34e..d661f67 100644
--- a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
+++ b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
@@ -18,11 +18,9 @@
  */
 package demo.spring.service;
 
-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;
 
 public class Server {
@@ -37,11 +35,7 @@ public class Server {
          * as a convenience so you do not need to configure your servlet
          * container to see CXF in action!
          */
-        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
-
-        SelectChannelConnector connector = new SelectChannelConnector();
-        connector.setPort(9002);
-        server.setConnectors(new Connector[] {connector});
+        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9002);
 
         WebAppContext webappcontext = new WebAppContext();
         webappcontext.setContextPath("/");

http://git-wip-us.apache.org/repos/asf/cxf/blob/fb94440f/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
index c8808f3..98eab1b 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
@@ -18,11 +18,9 @@
  */
 package demo.jaxrs.servlet;
 
-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;
 
 public class Server {
@@ -37,11 +35,7 @@ public class Server {
          * as a convenience so you do not need to configure your servlet
          * container to see CXF in action!
          */
-        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
-
-        SelectChannelConnector connector = new SelectChannelConnector();
-        connector.setPort(9002);
-        server.setConnectors(new Connector[] {connector});
+        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9002);
 
         WebAppContext webappcontext = new WebAppContext();
         webappcontext.setContextPath("/");

http://git-wip-us.apache.org/repos/asf/cxf/blob/fb94440f/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java
b/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java
index 53aed96..e5b2fed 100644
--- a/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java
+++ b/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java
@@ -19,11 +19,9 @@
 
 package demo.service;
 
-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;
 
 public class Server {
@@ -38,11 +36,8 @@ public class Server {
          * as a convenience so you do not need to configure your servlet
          * container to see CXF in action!
          */
-        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
+        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9002);
 
-        SelectChannelConnector connector = new SelectChannelConnector();
-        connector.setPort(9002);
-        server.setConnectors(new Connector[] {connector});
 
         WebAppContext webappcontext = new WebAppContext();
         webappcontext.setContextPath("/");

http://git-wip-us.apache.org/repos/asf/cxf/blob/fb94440f/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
index b17cdf9..dda52fc 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
+++ b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
@@ -18,11 +18,9 @@
  */
 package demo.spring.service;
 
-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;
 
 public class Server {
@@ -37,11 +35,7 @@ public class Server {
          * as a convenience so you do not need to configure your servlet
          * container to see CXF in action!
          */
-        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
-
-        SelectChannelConnector connector = new SelectChannelConnector();
-        connector.setPort(9002);
-        server.setConnectors(new Connector[] {connector});
+        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9002);
 
         WebAppContext webappcontext = new WebAppContext();
         webappcontext.setContextPath("/");


Mime
View raw message