320112 websocket in aggregates

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2147 7e9141cc-0065-0410-87d8-b60c137991c4

VERSION.txt

@@ -1,14 +1,19 @@
 jetty-7.2-SNAPSHOT
  + 319334 Concurrent, sharable ResourceCache
  + 319370 WebAppClassLoader.Context
+ + 320112 Websocket in aggregate jars
+ + JETTY-1245 Do not use direct buffers with NIO SSL
+ + JETTY-1249 Apply max idle time to all connectors
+ + Added ignore to Logger interface
+
+jetty-7.1.6.v20100715
  + 319519 Warn about duplicate configuration files
  + 319655 Reset HEAD status 
- + JETTY-1245 Do not use direct buffers with NIO SSL
  + JETTY-1247 synchronize recylcing of SSL NIO buffers 
  + JETTY-1248 fix parsing of bad multiparts
  + JETTY-1249 Apply max idle time to all connectors
  + JETTY-1251 Replace then close selector for JVM bugs
- + Added ignore to Logger interface
+
 
 jetty-7.1.5.v20100705
  + Update ecj to 3.6 Helios release drop

jetty-aggregate/jetty-all-server/pom.xml

@@ -127,6 +127,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-websocket</artifactId>
+          <version>${project.version}</version>
+          <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>

jetty-aggregate/jetty-all/pom.xml

@@ -101,6 +101,12 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-websocket</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>

jetty-aggregate/jetty-server/pom.xml

@@ -91,6 +91,12 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-websocket</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>

jetty-aggregate/jetty-servlet/pom.xml

@@ -96,5 +96,11 @@
       <artifactId>servlet-api</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-websocket</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>