📄 jetty6.patch
字号:
Index: examples/test-webapp/pom.xml
===================================================================
--- examples/test-webapp/pom.xml (revision 4810)
+++ examples/test-webapp/pom.xml (working copy)
@@ -69,39 +69,6 @@
</excludes> </configuration> </plugin>- <plugin>- <groupId>org.mortbay.jetty</groupId>- <artifactId>maven-jetty-plugin</artifactId>- <version>${project.version}</version>- <configuration>- <stopPort>8087</stopPort>- <stopKey>foo</stopKey>- <scanIntervalSeconds>1</scanIntervalSeconds>- <!-- contextPath>/test</contextPath -->- <systemProperties>- <systemProperty>- <name>fooprop</name>- <value>222</value>- </systemProperty>- </systemProperties>- <webAppConfig>- <contextPath>/test</contextPath>- <tempDirectory>${project.build.directory}/work</tempDirectory>- <sessionHandler implementation="org.mortbay.jetty.servlet.SessionHandler">- <sessionManager implementation="org.mortbay.jetty.servlet.HashSessionManager">- <storeDirectory>${basedir}/target/sessions</storeDirectory>- <!-- savePeriod>5</savePeriod -->- </sessionManager>- </sessionHandler>- </webAppConfig>- <userRealms>- <userRealm implementation="org.mortbay.jetty.security.HashUserRealm">- <name>Test Realm</name>- <config>../../etc/realm.properties</config>- </userRealm>- </userRealms>- </configuration>- </plugin> <!-- uncomment to precompile jsps --> <!-- <plugin>Index: extras/client/pom.xml
===================================================================
--- extras/client/pom.xml (revision 4810)
+++ extras/client/pom.xml (working copy)
@@ -46,57 +46,6 @@
</execution> </executions> </plugin>- <plugin>- <groupId>org.apache.felix</groupId>- <artifactId>maven-bundle-plugin</artifactId>- <version>${maven-bundle-plugin-version}</version>- <extensions>true</extensions>- <executions>- <execution>- <goals>- <goal>manifest</goal>- </goals>- <configuration>- <instructions>- <Bundle-SymbolicName>org.mortbay.jetty.client</Bundle-SymbolicName>- <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>- <Import-Package>*</Import-Package>- <Export-Package>org.mortbay.jetty.client;version=${project.version}</Export-Package>- <Bundle-DocURL>http://jetty.mortbay.org</Bundle-DocURL>- </instructions>- </configuration>- </execution>- </executions>- </plugin>- <plugin>- <!--- Required for OSGI- -->- <groupId>org.apache.maven.plugins</groupId>- <artifactId>maven-jar-plugin</artifactId>- <configuration>- <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>- </archive>- </configuration>- </plugin>- <plugin>- <artifactId>maven-assembly-plugin</artifactId>- <version>2.2-beta-3</version>- <configuration>- <descriptors>- <descriptor>src/main/assembly/assembly.xml</descriptor>- </descriptors>- </configuration>- <executions>- <execution>- <phase>package</phase>- <goals>- <goal>single</goal>- </goals>- </execution>- </executions>- </plugin> <!-- <plugin> <artifactId>minijar-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> Index: extras/sslengine/pom.xml
===================================================================
--- extras/sslengine/pom.xml (revision 4810)
+++ extras/sslengine/pom.xml (working copy)
@@ -57,38 +57,6 @@
</execution> </executions> </plugin>- <plugin>- <groupId>org.apache.felix</groupId>- <artifactId>maven-bundle-plugin</artifactId>- <version>${maven-bundle-plugin-version}</version>- <extensions>true</extensions>- <executions>- <execution>- <goals>- <goal>manifest</goal>- </goals>- <configuration>- <instructions>- <Bundle-SymbolicName>org.mortbay.jetty.security</Bundle-SymbolicName>- <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>- <Import-Package>*</Import-Package>- <Export-Package>org.mortbay.jetty.security;version=${project.version}</Export-Package>- <Bundle-DocURL>http://jetty.mortbay.org</Bundle-DocURL>- </instructions>- </configuration>- </execution>- </executions>- </plugin>- <plugin>- <groupId>org.apache.maven.plugins</groupId>- <artifactId>maven-jar-plugin</artifactId>- <version>${maven-jar-plugin-version}</version>- <configuration>- <archive>- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>- </archive>- </configuration>- </plugin> </plugins> </build> <dependencies>Index: modules/annotations/pom.xml
===================================================================
--- modules/annotations/pom.xml (revision 4810)
+++ modules/annotations/pom.xml (working copy)
@@ -51,31 +51,10 @@
</executions> </plugin> <plugin>- <groupId>org.apache.felix</groupId>- <artifactId>maven-bundle-plugin</artifactId>- <version>${maven-bundle-plugin-version}</version>- <extensions>true</extensions>+ <groupId>org.apache.maven.plugins</groupId>+ <artifactId>maven-dependency-plugin</artifactId> <executions> <execution>- <goals>- <goal>manifest</goal>- </goals>- <configuration>- <instructions>- <Bundle-SymbolicName>org.mortbay.jetty.annotations</Bundle-SymbolicName>- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>- <Bundle-DocURL>http://jetty.mortbay.org</Bundle-DocURL>- <Import-Package>!org.mortbay.jetty.annotations.*,*</Import-Package>- </instructions>- </configuration>- </execution>- </executions>- </plugin>- <plugin>- <groupId>org.codehaus.mojo</groupId>- <artifactId>dependency-maven-plugin</artifactId>- <executions>- <execution> <id>copy-deps</id> <phase>install</phase> <goals>@@ -94,18 +73,6 @@
</execution> </executions> </plugin>- <plugin>- <!--- Required for OSGI- -->- <groupId>org.apache.maven.plugins</groupId>- <artifactId>maven-jar-plugin</artifactId>- <configuration>- <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>- </archive>- </configuration>- </plugin> </plugins> </build> <dependencies>Index: modules/jetty/pom.xml
===================================================================
--- modules/jetty/pom.xml (revision 4810)
+++ modules/jetty/pom.xml (working copy)
@@ -92,53 +92,6 @@
</execution> </executions> </plugin>- <plugin>- <groupId>org.apache.felix</groupId>- <artifactId>maven-bundle-plugin</artifactId>- <version>${maven-bundle-plugin-version}</version>- <extensions>true</extensions>- <executions>- <execution>- <goals>- <goal>manifest</goal>- </goals>- <configuration>- <instructions>- <Bundle-SymbolicName>org.mortbay.jetty.server</Bundle-SymbolicName>- <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>- <Bundle-DocURL>http://jetty.mortbay.org</Bundle-DocURL>- <Import-Package>!org.mortbay.jetty.*,!org.mortbay.xml.*,!org.mortbay.resource.*,!org.mortbay.io.*,!org.mortbay.servlet.jetty.*,javax.servlet.resources;resolution:=optional,javax.servlet.jsp;resolution:=optional,org.apache.jasper.servlet;resolution:=optional,org.mortbay.jetty.handler.management;resolution:=optional,*</Import-Package>- </instructions>- </configuration>- </execution>- </executions>- </plugin>- <plugin>- <!--- Required for OSGI- -->- <groupId>org.apache.maven.plugins</groupId>- <artifactId>maven-jar-plugin</artifactId>- <executions>- <execution>- <id>artifact-jar</id>- <goals>- <goal>jar</goal>- </goals>- </execution>- <execution>- <id>test-jar</id>- <goals>- <goal>test-jar</goal>- </goals>- </execution>- </executions>- <configuration>- <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>- </archive>- </configuration>- </plugin> </plugins> </build> <dependencies>Index: modules/jsp-2.1/pom.xml
===================================================================
--- modules/jsp-2.1/pom.xml (revision 4810)
+++ modules/jsp-2.1/pom.xml (working copy)
@@ -76,25 +76,6 @@
</execution> </executions> </plugin>- <plugin>- <groupId>org.codehaus.mojo</groupId>- <artifactId>build-helper-maven-plugin</artifactId>- <version>1.1</version>- <executions>- <execution>- <id>add-source</id>- <phase>generate-sources</phase>- <goals>- <goal>add-source</goal>- </goals>- <configuration>- <sources>- <source>${project.build.directory}/generated-sources</source>- </sources>- </configuration>- </execution>- </executions>- </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions>@@ -124,36 +105,6 @@
</execution> </executions> </plugin>- <plugin>- <groupId>org.apache.felix</groupId>- <artifactId>maven-bundle-plugin</artifactId>- <extensions>true</extensions>- <executions>- <execution>- <goals>- <goal>manifest</goal>- </goals>- <configuration>- <instructions>- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>- <Import-Package>!com.sun.appserv.*,!com.sun.common.util.*,!com.sun.el.*,!com.sun.enterprise.web.*,!com.sun.org.apache.commons.*,!org.apache.jasper.*,*</Import-Package>- </instructions>- </configuration>- </execution>- </executions>- </plugin>- <plugin>- <!--- Required for OSGI- -->- <groupId>org.apache.maven.plugins</groupId>- <artifactId>maven-jar-plugin</artifactId>- <configuration>- <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>- </archive>- </configuration>- </plugin> </plugins> </build> <dependencies>Index: modules/naming/pom.xml
===================================================================
--- modules/naming/pom.xml (revision 4810)
+++ modules/naming/pom.xml (working copy)
@@ -43,41 +43,8 @@
</executions> </plugin> <plugin>- <groupId>org.apache.felix</groupId>- <artifactId>maven-bundle-plugin</artifactId>- <version>${maven-bundle-plugin-version}</version>- <extensions>true</extensions>- <executions>- <execution>- <goals>- <goal>manifest</goal>- </goals>- <configuration>- <instructions>- <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>⌨️ 快捷键说明
复制代码
Ctrl + C
搜索代码
Ctrl + F
全屏模式
F11
切换主题
Ctrl + Shift + D
显示快捷键
?
增大字号
Ctrl + =
减小字号
Ctrl + -