Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Prakash2012-09-27 13:54:47 -0400
committerWinston Prakash2012-09-27 13:54:47 -0400
commit8665339a0214b28e0afdc2b2015220eb68771a60 (patch)
tree2443e62d05616f4290475eb8b068705a78e6b73a
parent6d07b9fcd009cc2898e50f4c8014aba545b4c79f (diff)
downloadorg.eclipse.hudson.core-8665339a0214b28e0afdc2b2015220eb68771a60.tar.gz
org.eclipse.hudson.core-8665339a0214b28e0afdc2b2015220eb68771a60.tar.xz
org.eclipse.hudson.core-8665339a0214b28e0afdc2b2015220eb68771a60.zip
Upgrade to jetty version 8.xjetty-upgrade
-rw-r--r--hudson-core/pom.xml6
-rwxr-xr-xhudson-jetty-war-executable/pom.xml24
-rw-r--r--hudson-jetty-war-executable/src/main/java/org/eclipse/hudson/jetty/JettyLauncher.java17
-rwxr-xr-xhudson-jetty-war-executable/src/main/java/org/eclipse/hudson/war/Executable.java7
-rw-r--r--hudson-war/pom.xml81
-rw-r--r--pom.xml5
6 files changed, 105 insertions, 35 deletions
diff --git a/hudson-core/pom.xml b/hudson-core/pom.xml
index ce9eef70..e839198a 100644
--- a/hudson-core/pom.xml
+++ b/hudson-core/pom.xml
@@ -365,12 +365,6 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>ant-launcher</artifactId>
- <groupId>org.apache.ant</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/hudson-jetty-war-executable/pom.xml b/hudson-jetty-war-executable/pom.xml
index 447625be..95be6f11 100755
--- a/hudson-jetty-war-executable/pom.xml
+++ b/hudson-jetty-war-executable/pom.xml
@@ -19,18 +19,18 @@
<parent>
<groupId>org.eclipse.hudson</groupId>
<artifactId>hudson-parent</artifactId>
- <version> 3.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hudson-jetty-war-executable</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hudson :: jetty-war-executable</name>
<description>
- Class needed for Jetty server based executable war
+ Class needed for Jetty server based executable war
</description>
@@ -40,9 +40,15 @@
<dependencies>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.26</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.server.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.server.version}</version>
<type>jar</type>
</dependency>
<dependency>
@@ -52,6 +58,12 @@
<scope>test</scope>
<type>jar</type>
</dependency>
+ <dependency>
+ <artifactId>jetty-continuation</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <type>jar</type>
+ <version>8.1.7.v20120910</version>
+ </dependency>
</dependencies>
</project>
diff --git a/hudson-jetty-war-executable/src/main/java/org/eclipse/hudson/jetty/JettyLauncher.java b/hudson-jetty-war-executable/src/main/java/org/eclipse/hudson/jetty/JettyLauncher.java
index 8857c70c..75ce3138 100644
--- a/hudson-jetty-war-executable/src/main/java/org/eclipse/hudson/jetty/JettyLauncher.java
+++ b/hudson-jetty-war-executable/src/main/java/org/eclipse/hudson/jetty/JettyLauncher.java
@@ -20,11 +20,13 @@ import java.io.File;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.security.SslSocketConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.LoginService;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
/**
* Jetty Utility to launch the Jetty Server
@@ -119,6 +121,9 @@ public class JettyLauncher {
context.setDescriptor(warUrl.toExternalForm() + "/WEB-INF/web.xml");
context.setServer(server);
context.setWar(warUrl.toExternalForm());
+
+ LoginService loginService = new HashLoginService("defaultLoginService");
+ context.getSecurityHandler().setLoginService(loginService);
// This is used by Windows Service Installer in Hudson Management
System.out.println("War - " + warUrl.getPath());
@@ -132,7 +137,7 @@ public class JettyLauncher {
System.setProperty("hudson.pluginManager.disableUpdateCenterSwitch", "true");
}
- server.addHandler(context);
+ server.setHandler(context);
server.setStopAtShutdown(true);
server.start();
diff --git a/hudson-jetty-war-executable/src/main/java/org/eclipse/hudson/war/Executable.java b/hudson-jetty-war-executable/src/main/java/org/eclipse/hudson/war/Executable.java
index c1aeeb37..ff2d336c 100755
--- a/hudson-jetty-war-executable/src/main/java/org/eclipse/hudson/war/Executable.java
+++ b/hudson-jetty-war-executable/src/main/java/org/eclipse/hudson/war/Executable.java
@@ -35,8 +35,15 @@ public class Executable {
private final String[] jettyJars = {
"libs/jetty.jar",
+ "libs/jetty-web-app.jar",
+ "libs/jetty-continuation.jar",
"libs/jetty-util.jar",
+ "libs/jetty-http.jar",
+ "libs/jetty-io.jar",
+ "libs/jetty-security.jar",
+ "libs/jetty-servlet.jar",
"libs/jetty-servlet-api.jar",
+ "libs/jetty-xml.jar",
"libs/hudson-jetty-war-executable.jar"
};
private List<String> arguments;
diff --git a/hudson-war/pom.xml b/hudson-war/pom.xml
index 14a3d668..cd561048 100644
--- a/hudson-war/pom.xml
+++ b/hudson-war/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.hudson</groupId>
<artifactId>hudson-parent</artifactId>
- <version> 3.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -134,25 +134,81 @@
</artifactItem>
<artifactItem>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.26</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.server.version}</version>
<overWrite>true</overWrite>
<outputDirectory>target/generated-resources/libs</outputDirectory>
<destFileName>jetty.jar</destFileName>
</artifactItem>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.server.version}</version>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/generated-resources/libs</outputDirectory>
+ <destFileName>jetty-web-app.jar</destFileName>
+ </dependency>
<artifactItem>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ <version>${jetty.server.version}</version>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/generated-resources/libs</outputDirectory>
+ <destFileName>jetty-continuation.jar</destFileName>
+ </artifactItem>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>6.1.26</version>
+ <version>${jetty.server.version}</version>
<overWrite>true</overWrite>
<outputDirectory>target/generated-resources/libs</outputDirectory>
<destFileName>jetty-util.jar</destFileName>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.server.version}</version>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/generated-resources/libs</outputDirectory>
+ <destFileName>jetty-http.jar</destFileName>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty.server.version}</version>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/generated-resources/libs</outputDirectory>
+ <destFileName>jetty-io.jar</destFileName>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty.server.version}</version>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/generated-resources/libs</outputDirectory>
+ <destFileName>jetty-security.jar</destFileName>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-xml</artifactId>
+ <version>${jetty.server.version}</version>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/generated-resources/libs</outputDirectory>
+ <destFileName>jetty-xml.jar</destFileName>
+ </dependency>
+ <artifactItem>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.server.version}</version>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/generated-resources/libs</outputDirectory>
+ <destFileName>jetty-servlet.jar</destFileName>
</artifactItem>
<artifactItem>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5-20081211</version>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>${jetty.javax.serverlet.version}</version>
<overWrite>true</overWrite>
<outputDirectory>target/generated-resources/libs</outputDirectory>
<destFileName>jetty-servlet-api.jar</destFileName>
@@ -289,13 +345,6 @@
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<contextPath>${contextPath}</contextPath>
- <!--
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>${port}</port>
- </connector>
- </connectors>
- -->
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
diff --git a/pom.xml b/pom.xml
index 1f85a479..c8fed28e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,9 @@
<build.timestamp>${maven.build.timestamp}</build.timestamp>
<build.number />
+ <jetty.server.version>8.1.7.v20120910</jetty.server.version>
+ <jetty.javax.serverlet.version>3.0.0.v201112011016</jetty.javax.serverlet.version>
+
<maven-hpi-plugin.version>3.0.0-M2</maven-hpi-plugin.version>
<stapler.version>3.0.0-M2</stapler.version>
<maven-stapler-plugin.version>3.0.1</maven-stapler-plugin.version>
@@ -178,7 +181,7 @@
<!-- by default only check remote repositories once per week -->
<maven.repository.update.freqency>interval:10080</maven.repository.update.freqency>
- <!--Plugins versions-->
+ <!--Maven Plugins versions-->
<maven-pmd-plugin.version>2.5</maven-pmd-plugin.version>
<maven-release-plugin.version>2.1</maven-release-plugin.version>
<maven-remote-resources-plugin.version>1.1</maven-remote-resources-plugin.version>

Back to the top