jetty-9 - Reorganized SPDY modules.

This change was due to the fact that the old spdy-core and spdy-jetty modules had classes in the same package,
which is a problem for OSGi.
The old spdy-jetty module has been split in 2: spdy-client and spdy-server, and other SPDY modules just underwent a
renaming to make them more sound.

2 files changed, 21 insertions, 21 deletions

diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml
index 03da5633e3..adfeb259a7 100644
--- a/example-jetty-embedded/pom.xml
+++ b/example-jetty-embedded/pom.xml
@@ -41,7 +41,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.spdy</groupId>
-      <artifactId>spdy-jetty-http</artifactId>
+      <artifactId>spdy-http-server</artifactId>
       <version>${project.version}</version>
     </dependency>
      <dependency>
diff --git a/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
index f45c5d1831..bf3a6a55e4 100644
--- a/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
+++ b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
@@ -25,13 +25,13 @@ import org.eclipse.jetty.server.ForwardedRequestCustomizer;
 import org.eclipse.jetty.server.HttpChannelConfig;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
-import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.spdy.NPNServerConnectionFactory;
-import org.eclipse.jetty.spdy.http.PushStrategy;
-import org.eclipse.jetty.spdy.http.ReferrerPushStrategy;
-import org.eclipse.jetty.spdy.http.HTTPSPDYServerConnectionFactory;
+import org.eclipse.jetty.spdy.server.NPNServerConnectionFactory;
+import org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory;
+import org.eclipse.jetty.spdy.server.http.PushStrategy;
+import org.eclipse.jetty.spdy.server.http.ReferrerPushStrategy;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.util.thread.TimerScheduler;
@@ -47,7 +47,7 @@ public class ManyConnectors
     {
         String jetty_home = System.getProperty("jetty.home","../jetty-server/src/main/config");
         System.setProperty("jetty.home", jetty_home);
-        
+
         Server server = new Server();
 
         // HTTP connector
@@ -60,13 +60,13 @@ public class ManyConnectors
         sslContextFactory.setKeyStorePath(jetty_home + "/etc/keystore");
         sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4");
         sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g");
-        
+
         ServerConnector connector1 = new ServerConnector(server,sslContextFactory);
         connector1.setPort(8443);
-        
-        
+
+
         // A verbosely fully configured connector with SSL, SPDY and HTTP
-        
+
         HttpChannelConfig config = new HttpChannelConfig();
         config.setSecureScheme("https");
         config.setSecurePort(8443);
@@ -75,39 +75,39 @@ public class ManyConnectors
         config.setResponseHeaderSize(8192);
         config.addCustomizer(new ForwardedRequestCustomizer());
         config.addCustomizer(new SecureRequestCustomizer());
-        
+
         HttpConnectionFactory http = new HttpConnectionFactory(config);
         http.setInputBufferSize(16384);
-        
+
         PushStrategy push = new ReferrerPushStrategy();
         HTTPSPDYServerConnectionFactory spdy2 = new HTTPSPDYServerConnectionFactory(2,config,push);
         spdy2.setInputBufferSize(8192);
         spdy2.setInitialWindowSize(32768);
-        
+
         HTTPSPDYServerConnectionFactory spdy3 = new HTTPSPDYServerConnectionFactory(3,config,push);
         spdy2.setInputBufferSize(8192);
-        
+
         NPNServerConnectionFactory npn = new NPNServerConnectionFactory(spdy3.getProtocol(),spdy2.getProtocol(),http.getProtocol());
         npn.setDefaultProtocol(http.getProtocol());
         npn.setInputBufferSize(1024);
-        
+
         SslConnectionFactory ssl = new SslConnectionFactory(sslContextFactory,npn.getProtocol());
- 
+
         QueuedThreadPool threadPool = new QueuedThreadPool();
         threadPool.setMaxThreads(256);
         TimerScheduler scheduler = new TimerScheduler();
         ByteBufferPool bufferPool= new ArrayByteBufferPool(32,4096,32768);
-        
-        ServerConnector connector2 = new ServerConnector(server,threadPool,scheduler,bufferPool,2,2,ssl,npn,spdy3,spdy2,http);            
+
+        ServerConnector connector2 = new ServerConnector(server,threadPool,scheduler,bufferPool,2,2,ssl,npn,spdy3,spdy2,http);
         connector2.setDefaultProtocol("ssl-npn");
         connector2.setPort(8444);
         connector2.setIdleTimeout(30000);
         connector2.setSoLingerTime(10000);
-        
+
         // Set the connectors
         server.setConnectors(new Connector[] { connector0, connector1, connector2 });
 
-        
+
         server.setHandler(new HelloHandler());
 
         server.start();