jetty6_old.patch

是离开的肌肤了卡机是离开的就富利卡及是了的开发及拉考试及的福利科技阿斯利康的肌肤莱卡及时的离开福建阿斯顿发

Index: pom.xml
===================================================================
--- pom.xml	(revision 2399)
+++ pom.xml	(working copy)
@@ -122,23 +122,6 @@
     <testSourceDirectory>src/test/java</testSourceDirectory>
     <outputDirectory>target/classes</outputDirectory>
     <testOutputDirectory>target/test-classes</testOutputDirectory>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-ssh-external</artifactId>
-        <version>${maven-wagon-version}</version>
-      </extension>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-ssh</artifactId>
-        <version>${maven-wagon-version}</version>
-      </extension>
-      <extension>
-	<groupId>org.apache.maven.wagon</groupId>
-	<artifactId>wagon-webdav</artifactId>
-	<version>${maven-wagon-version}</version>
-      </extension>
-    </extensions>
     <defaultGoal>install</defaultGoal>
     <resources>
       <resource>
@@ -160,12 +143,7 @@
           <target>1.4</target>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <tagBase>https://svn.codehaus.org/jetty/jetty/tags</tagBase>
-        </configuration>
-      </plugin>
+     
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -176,44 +154,14 @@
             <manifestEntries>
               <mode>development</mode>
               <url>${pom.url}</url>
-	      <implementation-version>${pom.version}</implementation-version>
+         
 	      <package>org.mortbay</package>
             </manifestEntries>
           </archive>
         </configuration>
       </plugin>
 
-      <plugin>
-	<inherited>true</inherited>
-	<groupId>org.apache.maven.plugins</groupId>
-	<artifactId>maven-source-plugin</artifactId>
-	<executions>
-	  <execution>
-	    <id>attach-sources</id>
-	    <goals>
-	      <goal>jar</goal>
-	    </goals>
-	  </execution>
-	</executions>
-      </plugin>
 
-      <!-- plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clover-plugin</artifactId>
-        <configuration>
-	  <jdk>1.5</jdk>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>instrument</goal>
-              <goal>aggregate</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin -->
-
     </plugins>
     <pluginManagement>
       <plugins>
@@ -236,43 +184,43 @@
     <module>modules/jetty</module>
     <module>modules/jsp-api-2.1</module>
     <module>modules/jsp-2.1</module>
-    <module>modules/jsp-api-2.0</module>
-    <module>modules/jsp-2.0</module>
-    <module>modules/management</module>
+    <!--module>modules/jsp-api-2.0</module-->
+    <!--module>modules/jsp-2.0</module-->
+    <!--module>modules/management</module-->
     <module>modules/start</module>
-    <module>modules/maven-plugin</module>
-    <module>modules/jspc-maven-plugin</module>
+    <!--module>modules/maven-plugin</module-->
+    <!--module>modules/jspc-maven-plugin</module-->
     <module>modules/naming</module>
-    <module>modules/plus</module>
+    <!--module>modules/plus</module-->
     <module>modules/html</module>
-    <module>modules/annotations</module>
+    <!--module>modules/annotations</module-->
 
-    <module>extras/servlet-tester</module>
-    <module>extras/xbean</module>
-    <module>extras/spring</module>
-    <module>extras/sslengine</module>
-    <module>extras/ajp</module>
-    <module>extras/win32service</module>
+    <module>extras/servlet-tester</module>
+    <!--module>extras/xbean</module-->
+    <!--module>extras/spring</module-->
+    <module>extras/sslengine</module>
+    <module>extras/ajp</module>
+    <!--module>extras/win32service</module-->
     <!--module>extras/gwt</module-->
-    <module>extras/threadpool</module>
-    <module>extras/client</module>
+    <!--module>extras/threadpool</module-->
+    <!--module>extras/client</module-->
 
     <module>examples/test-webapp</module>
-    <module>examples/test-jaas-webapp</module>
-    <module>examples/test-jndi-webapp</module>
-    <module>examples/embedded</module>
-    <!-- <module>examples/spring-ebj3-demo</module> -->
-    <module>examples/tests</module>
+    <!--module>examples/test-jaas-webapp</module-->
+    <!--module>examples/test-jndi-webapp</module-->
+    <!--module>examples/embedded</module-->
+    <!--module>examples/spring-ebj3-demo</module-->
+    <!--module>examples/tests</module-->
 
 
     <module>contrib/cometd</module>
-    <module>contrib/jetty-ant</module>
+    <!--module>contrib/jetty-ant</module-->
     <module>contrib/jetty-rewrite-handler</module>
     <!--module>contrib/grizzly</module-->
     <!--module>contrib/wadi</module-->
     <!--module>contrib/terracotta</module-->
 
-    <module>extras/setuid</module>
+    <!--module>extras/setuid</module-->
   </modules>
 
   <reporting>
@@ -368,6 +316,5 @@
     <slf4j-version>1.3.1</slf4j-version>
     <maven-bundle-plugin-version>1.4.0</maven-bundle-plugin-version>
     <maven-jar-plugin-version>2.2</maven-jar-plugin-version>
-    <maven-wagon-version>1.0-beta-2</maven-wagon-version>
   </properties>
 </project>
Index: modules/plus/pom.xml
===================================================================
--- modules/plus/pom.xml	(revision 2399)
+++ modules/plus/pom.xml	(working copy)
@@ -61,6 +61,7 @@
           </execution>
         </executions>
       </plugin>
+      <!--
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -81,6 +82,7 @@
            </execution>
         </executions>
       </plugin>
+      
       <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
@@ -91,6 +93,7 @@
          </archive>
        </configuration>
       </plugin>
+      -->
     </plugins>
   </build>
   <dependencies>
Index: modules/jsp-2.1/pom.xml
===================================================================
--- modules/jsp-2.1/pom.xml	(revision 2399)
+++ modules/jsp-2.1/pom.xml	(working copy)
@@ -87,8 +87,7 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>dependency-maven-plugin</artifactId>
+        <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
             <phase>install</phase>
@@ -113,6 +113,7 @@
           </execution>
         </executions>
       </plugin>
+      <!--
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -132,6 +133,7 @@
            </execution>
         </executions>
       </plugin>
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -142,6 +144,8 @@
           </archive>
         </configuration>
       </plugin>
+      
+      -->
     </plugins>
   </build>
   <dependencies>
Index: modules/annotations/pom.xml
===================================================================
--- modules/annotations/pom.xml	(revision 2399)
+++ modules/annotations/pom.xml	(working copy)
@@ -56,6 +56,7 @@
           </execution>
         </executions>
       </plugin>
+      <!--
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -77,6 +78,7 @@
            </execution>
         </executions>
       </plugin>
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -87,6 +89,8 @@
           </archive>
         </configuration>
       </plugin>
+      
+      -->
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
Index: modules/servlet-api-2.5/pom.xml
===================================================================
--- modules/servlet-api-2.5/pom.xml	(revision 2399)
+++ modules/servlet-api-2.5/pom.xml	(working copy)
@@ -66,6 +66,7 @@
         </configuration>
       </plugin>
 
+<!--
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -99,6 +100,8 @@
           </archive>
         </configuration>
       </plugin>
+      
+      -->
 
     </plugins>
   </build>
Index: modules/jetty/pom.xml
===================================================================
--- modules/jetty/pom.xml	(revision 2399)
+++ modules/jetty/pom.xml	(working copy)
@@ -58,6 +58,7 @@
           </execution>
         </executions>
       </plugin>
+      <!--
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -89,6 +90,7 @@
           </archive>
         </configuration>
       </plugin>
+      -->
     </plugins>
   </build>
   <dependencies>
Index: modules/jsp-api-2.1/pom.xml
===================================================================
--- modules/jsp-api-2.1/pom.xml	(revision 2399)
+++ modules/jsp-api-2.1/pom.xml	(working copy)
@@ -75,6 +75,7 @@
           </execution>
         </executions>
       </plugin>
+      <!--
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -108,6 +109,7 @@
           </archive>
         </configuration>
       </plugin>
+      -->
     </plugins>
   </build>
   <dependencies>