From 18d40c0909309f145fd36e2b35f009484787829f Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Tue, 24 Jan 2012 10:37:20 +0100
Subject: [PATCH 2/6] Cleaup distribution generation

We recreate distribution package anyway, this just complicated things
---
 jetty-distribution/pom.xml |   46 --------------------------------------------
 1 files changed, 0 insertions(+), 46 deletions(-)

diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 13560e3..70677a9 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -64,71 +64,25 @@
                 <!-- 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-3.0.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>
-- 
1.7.6.2