You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/03/09 07:29:21 UTC
svn commit: r751600 - in /geronimo/server/trunk/plugins/jetty: ./
geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/
geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/
geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/
Author: djencks
Date: Mon Mar 9 06:29:20 2009
New Revision: 751600
URL: http://svn.apache.org/viewvc?rev=751600&view=rev
Log:
GERONIMO-4577 upgrade jetty to 6.1.14. There are dependency problems I don't understand with 6.1.15, but this gets the api changes in.
Modified:
geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/AbstractPreHandler.java
geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/AbstractImmutableHandler.java
geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/TwistyWebAppContext.java
geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ApplicationTest.java
geronimo/server/trunk/plugins/jetty/pom.xml
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/AbstractPreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/AbstractPreHandler.java?rev=751600&r1=751599&r2=751600&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/AbstractPreHandler.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/AbstractPreHandler.java Mon Mar 9 06:29:20 2009
@@ -19,6 +19,7 @@
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.Server;
+import org.mortbay.component.LifeCycle;
/**
* @version $Rev: 449059 $ $Date: 2006-09-23 05:23:09 +1000 (Sat, 23 Sep 2006) $
@@ -38,6 +39,12 @@
throw new UnsupportedOperationException();
}
+ public void addLifeCycleListener(Listener listener) {
+ }
+
+ public void removeLifeCycleListener(Listener listener) {
+ }
+
public final boolean isRunning() {
throw new UnsupportedOperationException();
}
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/AbstractImmutableHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/AbstractImmutableHandler.java?rev=751600&r1=751599&r2=751600&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/AbstractImmutableHandler.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/AbstractImmutableHandler.java Mon Mar 9 06:29:20 2009
@@ -23,6 +23,7 @@
import org.mortbay.jetty.Server;
import org.mortbay.jetty.handler.AbstractHandler;
import org.mortbay.jetty.handler.AbstractHandlerContainer;
+import org.mortbay.component.LifeCycle;
/**
* @version $Rev$ $Date$
@@ -115,4 +116,10 @@
public boolean isFailed() {
return false;
}
+
+ public void addLifeCycleListener(Listener listener) {
+ }
+
+ public void removeLifeCycleListener(Listener listener) {
+ }
}
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/TwistyWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/TwistyWebAppContext.java?rev=751600&r1=751599&r2=751600&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/TwistyWebAppContext.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/TwistyWebAppContext.java Mon Mar 9 06:29:20 2009
@@ -33,6 +33,7 @@
import org.mortbay.jetty.servlet.ServletHandler;
import org.mortbay.jetty.servlet.SessionHandler;
import org.mortbay.jetty.webapp.WebAppContext;
+import org.mortbay.component.LifeCycle;
/**
* @version $Rev$ $Date$
@@ -108,5 +109,11 @@
public boolean isFailed() {
return TwistyWebAppContext.super.isFailed();
}
+
+ public void addLifeCycleListener(Listener listener) {
+ }
+
+ public void removeLifeCycleListener(Listener listener) {
+ }
}
}
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ApplicationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ApplicationTest.java?rev=751600&r1=751599&r2=751600&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ApplicationTest.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ApplicationTest.java Mon Mar 9 06:29:20 2009
@@ -28,6 +28,7 @@
import javax.servlet.http.HttpServletResponse;
import org.mortbay.jetty.servlet.SessionHandler;
+import org.mortbay.component.LifeCycle;
/**
@@ -69,7 +70,12 @@
throws IOException, ServletException {
next.handle(target, request, response, dispatch);
}
-
+
+ public void addLifeCycleListener(Listener listener) {
+ }
+
+ public void removeLifeCycleListener(Listener listener) {
+ }
};
}
Modified: geronimo/server/trunk/plugins/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/pom.xml?rev=751600&r1=751599&r2=751600&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/pom.xml Mon Mar 9 06:29:20 2009
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.7</version>
+ <version>6.1.14</version>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
@@ -54,19 +54,19 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-ajp</artifactId>
- <version>6.1.7</version>
+ <version>6.1.14</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-sslengine</artifactId>
- <version>6.1.7</version>
+ <version>6.1.14</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>6.1.7</version>
+ <version>6.1.14</version>
</dependency>
</dependencies>