From 0797e8a23d10677ebdac8fd143c10e31ae7ad65b Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jesse.mcconnell@gmail.com>
Date: Wed, 1 Feb 2012 17:25:11 -0600
Subject: [PATCH] merge from master

---
 example-async-rest/async-rest-jar/pom.xml    |  6 +-
 example-async-rest/async-rest-webapp/pom.xml |  4 +-
 jetty-aggregate/jetty-all-server/pom.xml     |  6 +-
 jetty-aggregate/jetty-all/pom.xml            | 39 +--------
 jetty-aggregate/jetty-plus/pom.xml           | 42 +---------
 jetty-distribution/pom.xml                   | 88 +-------------------
 jetty-jsp/pom.xml                            | 10 +--
 jetty-util/pom.xml                           |  5 ++
 pom.xml                                      |  6 +-
 9 files changed, 27 insertions(+), 179 deletions(-)

diff --git a/example-async-rest/async-rest-jar/pom.xml b/example-async-rest/async-rest-jar/pom.xml
index ed7629b7859..894f2c448ed 100644
--- a/example-async-rest/async-rest-jar/pom.xml
+++ b/example-async-rest/async-rest-jar/pom.xml
@@ -15,9 +15,9 @@
       <artifactId>jetty-client</artifactId>
       <version>${project.version}</version>
     </dependency>
-      <dependency>
-         <groupId>${servlet.spec.groupId}</groupId>
-         <artifactId>${servlet.spec.artifactId}</artifactId>
+    <dependency>
+         <groupId>org.eclipse.jetty.orbit</groupId>
+         <artifactId>javax.servlet</artifactId>
          <scope>provided</scope>
        </dependency>
   </dependencies>
diff --git a/example-async-rest/async-rest-webapp/pom.xml b/example-async-rest/async-rest-webapp/pom.xml
index 0cb8d8924f9..650e8b7d689 100644
--- a/example-async-rest/async-rest-webapp/pom.xml
+++ b/example-async-rest/async-rest-webapp/pom.xml
@@ -25,8 +25,8 @@
       <scope>test</scope>
     </dependency>
       <dependency>
-         <groupId>${servlet.spec.groupId}</groupId>
-         <artifactId>${servlet.spec.artifactId}</artifactId>
+         <groupId>org.eclipse.jetty.orbit</groupId>
+         <artifactId>javax.servlet</artifactId>
          <scope>provided</scope>
        </dependency>
   </dependencies>
diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml
index 8a2e9a79d49..31533d1148e 100644
--- a/jetty-aggregate/jetty-all-server/pom.xml
+++ b/jetty-aggregate/jetty-all-server/pom.xml
@@ -114,7 +114,7 @@
         </plugins>
     </build>
 
-    <dependencies>
+ <dependencies>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-deploy</artifactId>
@@ -128,8 +128,8 @@
           <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.servlet</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
index 5fdf78d264c..41d32683642 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -92,7 +92,7 @@
     </plugins>
   </build>
 
-  <dependencies>
+<dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
@@ -104,16 +104,6 @@
       <artifactId>jetty-deploy</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.mortbay.jetty</groupId>
-           <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -122,8 +112,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <groupId>org.eclipse.jetty.orbit</groupId>
+      <artifactId>javax.servlet</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -137,24 +127,6 @@
       <artifactId>jetty-plus</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jta_1.1_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -192,11 +164,6 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-      <dependency>
-         <groupId>${servlet.spec.groupId}</groupId>
-         <artifactId>${servlet.spec.artifactId}</artifactId>
-         <scope>compile</scope>
-       </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-nested</artifactId>
diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml
index ad7c06ed6b7..0c20198f733 100644
--- a/jetty-aggregate/jetty-plus/pom.xml
+++ b/jetty-aggregate/jetty-plus/pom.xml
@@ -69,7 +69,7 @@
                   <url>http://eclipse.org/jetty</url>
                   <Built-By>${user.name}</Built-By>
                   <package>org.eclipse.jetty</package>
-                  <Bundle-License>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk/NOTICE.txt</Bundle-License>
+                  <Bundle-License>http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/NOTICE.txt</Bundle-License>
                   <Bundle-Name>Jetty HTTP Server</Bundle-Name>
                 </manifestEntries>
               </archive>
@@ -86,44 +86,6 @@
       <artifactId>jetty-plus</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jta_1.1_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.1_spec</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index d32cff3dbf5..4a2578ce2a3 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -10,19 +10,6 @@
   <packaging>pom</packaging>
   <properties>
     <assembly-directory>target/distribution</assembly-directory>
-    <eclipse-ecj-version>3.6</eclipse-ecj-version>
-    <orbit-javax-activation-version>${javax-activation-version}.0.v201005080500</orbit-javax-activation-version>
-    <orbit-javax-annotation-version>1.0.0.v20100513-0750</orbit-javax-annotation-version>
-    <orbit-javax-el-version>2.1.0.v201004190952</orbit-javax-el-version>
-    <orbit-javax-mail-glassfish-version>${javax-mail-version}.v201005082020</orbit-javax-mail-glassfish-version>
-    <orbit-javax-servlet-version>2.5.0.v200910301333</orbit-javax-servlet-version>
-    <orbit-javax-servlet-jsp-version>2.1.0.v201004190952</orbit-javax-servlet-jsp-version>
-    <orbit-javax-servlet-jsp-jstl-version>1.2.0.v201004190952</orbit-javax-servlet-jsp-jstl-version>
-    <orbit-com-sun-el-version>1.0.0.v201004190952</orbit-com-sun-el-version>
-    <orbit-org-apache-jasper-version>2.1.0.v201110031002</orbit-org-apache-jasper-version>
-    <orbit-org-apache-taglibs-standard-version>1.2.0.v201004190952</orbit-org-apache-taglibs-standard-version>
-    <orbit-org-objectweb-asm-version>3.1.0.v200803061910</orbit-org-objectweb-asm-version>
-    <orbit-javax-transaction-version>1.1.1.v201004190952</orbit-javax-transaction-version>
   </properties>
   <build>
     <plugins>
@@ -60,74 +47,6 @@
             </goals>
             <configuration>
               <tasks>
-                <!-- This is the Orbit Downloads Process -->
-
-                <!-- Step 1: download orbit artifact into orbit-cache (if not present) -->
-                <property name="orbit-cache" value="${user.home}/.m2/eclipse-orbit" />
-
-                <mkdir dir="${orbit-cache}" />
-                <get dest="${orbit-cache}" verbose="true" skipexisting="true">
-                  <url url="${jetty-orbit-url}/javax.servlet_${orbit-javax-servlet-version}.jar" />
-                  <url url="${jetty-orbit-url}/javax.activation_${orbit-javax-activation-version}.jar" />
-                  <url url="${jetty-orbit-url}/javax.annotation_${orbit-javax-annotation-version}.jar" />
-                  <url url="${jetty-orbit-url}/javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" />
-                  <url url="${jetty-orbit-url}/javax.el_${orbit-javax-el-version}.jar" />
-                  <url url="${jetty-orbit-url}/javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" />
-                  <url url="${jetty-orbit-url}/javax.servlet.jsp.jstl_${orbit-javax-servlet-jsp-jstl-version}.jar" />
-                  <url url="${jetty-orbit-url}/com.sun.el_${orbit-com-sun-el-version}.jar" />
-                  <url url="${jetty-orbit-url}/org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" />
-                  <url url="${jetty-orbit-url}/org.apache.taglibs.standard.glassfish_${orbit-org-apache-taglibs-standard-version}.jar" />
-                  <url url="${jetty-orbit-url}/org.objectweb.asm_${orbit-org-objectweb-asm-version}.jar" />
-                  <url url="${jetty-orbit-url}/javax.transaction_${orbit-javax-transaction-version}.jar" />
-                  <url url="${jetty-orbit-url}/ecj-${eclipse-ecj-version}.jar" />
-                </get>
-
-                <!-- Step 2: copy the orbit artifact from orbit-cache to the appropriate lib directory -->
-
-                <!-- ${jetty.home}/lib/ -->
-                <mkdir dir="${assembly-directory}/lib" />
-                <copy file="${orbit-cache}/javax.servlet_${orbit-javax-servlet-version}.jar" tofile="${assembly-directory}/lib/servlet-api-2.5.jar" />
-
-                <!-- ${jetty.home}/lib/annotations/ -->
-                <mkdir dir="${assembly-directory}/lib/annotations" />
-                <copy todir="${assembly-directory}/lib/annotations">
-                  <fileset dir="${orbit-cache}">
-                    <include name="javax.annotation_${orbit-javax-annotation-version}.jar" />
-                    <include name="org.objectweb.asm_${orbit-org-objectweb-asm-version}.jar" />
-                  </fileset>
-                </copy>
-
-                <!-- ${jetty.home}/lib/jndi/ -->
-                <mkdir dir="${assembly-directory}/lib/jndi" />
-                <copy todir="${assembly-directory}/lib/jndi">
-                  <fileset dir="${orbit-cache}">
-                    <include name="javax.activation_${orbit-javax-activation-version}.jar" />
-                    <include name="javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" />
-                  </fileset>
-                </copy>
-
-               <!-- ${jetty.home}/lib/jta/ -->
-                <mkdir dir="${assembly-directory}/lib/jta" />
-                <copy todir="${assembly-directory}/lib/jta">
-                  <fileset dir="${orbit-cache}">
-                    <include name="javax.transaction_${orbit-javax-transaction-version}.jar" />
-                  </fileset>
-                </copy>
-
-                <!-- ${jetty.home}/lib/jsp/ -->
-                <mkdir dir="${assembly-directory}/lib/jsp" />
-                <copy todir="${assembly-directory}/lib/jsp">
-                  <fileset dir="${orbit-cache}">
-                    <include name="javax.el_${orbit-javax-el-version}.jar" />
-                    <include name="javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" />
-                    <include name="javax.servlet.jsp.jstl_${orbit-javax-servlet-jsp-jstl-version}.jar" />
-                    <include name="com.sun.el_${orbit-com-sun-el-version}.jar" />
-                    <include name="org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" />
-                    <include name="org.apache.taglibs.standard.glassfish_${orbit-org-apache-taglibs-standard-version}.jar" />
-                    <include name="ecj-${eclipse-ecj-version}.jar" />
-                  </fileset>
-                </copy>
-
                 <chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" />
               </tasks>
             </configuration>
@@ -225,7 +144,7 @@
                   <version>${orbit-servlet-api-version}</version>
                   <overWrite>true</overWrite>
                   <outputDirectory>${assembly-directory}/lib</outputDirectory>
-                  <destFileName>servlet-api-2.5.jar</destFileName>
+                  <destFileName>servlet-api-3.0.jar</destFileName>
                 </artifactItem>
               </artifactItems>
             </configuration>
@@ -458,11 +377,6 @@
       <artifactId>jetty-policy</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${servlet.spec.groupId}</groupId>
-      <artifactId>${servlet.spec.artifactId}</artifactId>
-      <version>${servlet.spec.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlets</artifactId>
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
index ec81f9ef0b0..fcdf826c1b0 100644
--- a/jetty-jsp/pom.xml
+++ b/jetty-jsp/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.1-SNAPSHOT</version>
+    <version>8.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-jsp</artifactId>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.servlet.jsp</artifactId>
-      <version>2.1.0.v201105211820</version>
+      <version>2.2.0.v201112011158</version>
     </dependency>
     <!-- JSP Impl -->
     <dependency>
        <groupId>org.eclipse.jetty.orbit</groupId>
        <artifactId>org.apache.jasper.glassfish</artifactId>
-       <version>2.1.0.v201110031002</version>
+       <version>2.2.2.v201112011158</version>
     </dependency>
     <!-- JSTL Api -->
     <dependency>
@@ -40,13 +40,13 @@
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.el</artifactId>
-      <version>2.1.0.v201105211819</version>
+      <version>2.2.0.v201108011116</version>
     </dependency>
     <!-- EL Impl -->
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>com.sun.el</artifactId>
-      <version>1.0.0.v201105211818</version>
+      <version>2.2.0.v201108011116</version>
     </dependency>
     <!-- Eclipse Java Compiler (for JSP Compilation) -->
     <dependency>
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index acfb7e95abd..772451bc938 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -69,6 +69,11 @@
     </plugins>
   </build>
   <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.orbit</groupId>
+      <artifactId>javax.servlet</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-test-helper</artifactId>
diff --git a/pom.xml b/pom.xml
index ce3b672f63a..2766583e3ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -384,9 +384,9 @@
     <dependencies>
       <!-- Orbit Deps -->
       <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>servlet-api</artifactId>
-         <version>2.5</version>
+         <groupId>org.eclipse.jetty.orbit</groupId>
+         <artifactId>javax.servlet</artifactId>
+         <version>3.0.0.v201112011016</version>
        </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.orbit</groupId>