From ec7eb3348addb6de5902b4115e5ad6aea258c38b Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jesse.mcconnell@gmail.com>
Date: Wed, 18 Jan 2012 15:16:34 -0600
Subject: [PATCH] Revert "Get rid of javax.activation."

this was not appropriate for jetty7 which needs to support java 1.5 which is not universally bundling javax.activation as previously understood.  The original commit should stand for jetty 8 though which will be handled during that merge

This reverts commit fae4f3fda93cbe2b0fe6dec42c1dec54a491c69a.
---
 jetty-aggregate/jetty-all-server/pom.xml | 9 +++++++++
 jetty-aggregate/jetty-all/pom.xml        | 9 +++++++++
 jetty-aggregate/jetty-plus/pom.xml       | 9 +++++++++
 jetty-distribution/pom.xml               | 2 ++
 jetty-osgi/test-jetty-osgi/pom.xml       | 2 ++
 pom.xml                                  | 6 ++++++
 6 files changed, 37 insertions(+)

diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml
index ed343ae1360..072ff23321e 100644
--- a/jetty-aggregate/jetty-all-server/pom.xml
+++ b/jetty-aggregate/jetty-all-server/pom.xml
@@ -163,6 +163,10 @@
                     <groupId>javax.mail</groupId>
                     <artifactId>mail</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.activation</groupId>
+                    <artifactId>activation</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -233,6 +237,11 @@
             <artifactId>mail</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaspic_1.0_spec</artifactId>
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
index a59ba910ca0..3a6eee3ac51 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -147,6 +147,10 @@
           <groupId>javax.mail</groupId>
           <artifactId>mail</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -217,6 +221,11 @@
       <artifactId>mail</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jaspic_1.0_spec</artifactId>
diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml
index e265fb4cb04..ff9bf1f74c9 100644
--- a/jetty-aggregate/jetty-plus/pom.xml
+++ b/jetty-aggregate/jetty-plus/pom.xml
@@ -96,6 +96,10 @@
           <groupId>javax.mail</groupId>
           <artifactId>mail</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -113,5 +117,10 @@
       <artifactId>mail</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 53351fd1e15..173d546d426 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -12,6 +12,7 @@
     <jetty-orbit-url>http://download.eclipse.org/jetty/orbit</jetty-orbit-url>
     <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>
@@ -68,6 +69,7 @@
                 <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" />
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 8a67c0316b8..eedcb97f358 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -14,6 +14,7 @@
     <jetty-orbit-url>http://download.eclipse.org/jetty/orbit/</jetty-orbit-url>
     <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>
@@ -197,6 +198,7 @@
                 <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.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" />
diff --git a/pom.xml b/pom.xml
index 534c7e60ef2..63315d4c21c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,7 @@
   <url>${jetty.url}</url>
   <packaging>pom</packaging>
   <properties>
+    <javax-activation-version>1.1</javax-activation-version>
     <javax-mail-version>1.4.1</javax-mail-version>
     <javax-servlet-jsp-version>2.1.v20100127</javax-servlet-jsp-version>
     <javax-transaction-version>1.1.1</javax-transaction-version>
@@ -401,6 +402,11 @@
         <artifactId>mail</artifactId>
         <version>${javax-mail-version}</version>
       </dependency>
+      <dependency>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
+        <version>${javax-activation-version}</version>
+      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>