[picocontainer-scm] [5651] java/2.x/trunk/jetty/core: latest jetty 6 now compatible

Revision 5651
Author paul
Date 2010-02-24 11:55:59 -0600 (Wed, 24 Feb 2010)

Log Message

latest jetty 6 now compatible

Modified Paths

- java/2.x/trunk/jetty/core/pom.xml

- java/2.x/trunk/jetty/core/src/java/org/picocontainer/jetty/PicoWebAppContext.java

- java/2.x/trunk/jetty/core/src/test/org/picocontainer/jetty/DependencyInjectionServletWarFileTestCase.java

- java/2.x/trunk/jetty/groovy/pom.xml

Diff

Modified: java/2.x/trunk/jetty/core/pom.xml (5650 => 5651)

--- java/2.x/trunk/jetty/core/pom.xml 2010-02-24 04:34:03 UTC (rev 5650)
+++ java/2.x/trunk/jetty/core/pom.xml 2010-02-24 17:55:59 UTC (rev 5651)
@@ -48,30 +48,31 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
- <version>9.1.1.B51.25.p1</version>
+ <version>9.1.1.B60.25.p2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1-glassfish</artifactId>
- <version>9.1.1.B51.25.p1</version>
+ <version>9.1.1.B60.25.p2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>core</artifactId>
<version>3.1.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.19</version>
+ <version>6.1.22</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>6.1.19</version>
+ <version>6.1.22</version>
<scope>provided</scope>
</dependency>
<dependency>

Modified: java/2.x/trunk/jetty/core/src/java/org/picocontainer/jetty/PicoWebAppContext.java (5650 => 5651)

--- java/2.x/trunk/jetty/core/src/java/org/picocontainer/jetty/PicoWebAppContext.java 2010-02-24 04:34:03 UTC (rev 5650)
+++ java/2.x/trunk/jetty/core/src/java/org/picocontainer/jetty/PicoWebAppContext.java 2010-02-24 17:55:59 UTC (rev 5651)
@@ -9,12 +9,11 @@

package org.picocontainer.jetty;

+import org.mortbay.jetty.servlet.ServletHandler;
+import org.mortbay.jetty.webapp.Configuration;
import org.mortbay.jetty.webapp.WebAppContext;
import org.mortbay.jetty.webapp.WebXmlConfiguration;
-import org.mortbay.jetty.webapp.Configuration;
-import org.mortbay.jetty.servlet.ServletHandler;
import org.picocontainer.PicoContainer;
-import org.picocontainer.jetty.PicoServletHandler;

public class PicoWebAppContext extends WebAppContext {
private final PicoContainer parentContainer;
@@ -24,6 +23,8 @@
this.parentContainer = parentContainer;
}

+ boolean doSuperIsRunning = true;
+
protected void loadConfigurations() throws Exception {
super.loadConfigurations();
Configuration[] configurations = getConfigurations();
@@ -32,9 +33,19 @@
configurations[i] = new PicoWebXmlConfiguration(parentContainer);
}
}
+ doSuperIsRunning = false;
setConfigurations(configurations);
+ doSuperIsRunning = true;
}

+ @Override
+ public boolean isRunning() {
+ if (doSuperIsRunning) {
+ return super.isRunning();
+ } else {
+ return false;
+ }
+ }
/* ------------------------------------------------------------ */
public ServletHandler getServletHandler() {
return super.getServletHandler();

Modified: java/2.x/trunk/jetty/core/src/test/org/picocontainer/jetty/DependencyInjectionServletWarFileTestCase.java (5650 => 5651)

--- java/2.x/trunk/jetty/core/src/test/org/picocontainer/jetty/DependencyInjectionServletWarFileTestCase.java 2010-02-24 04:34:03 UTC (rev 5650)
+++ java/2.x/trunk/jetty/core/src/test/org/picocontainer/jetty/DependencyInjectionServletWarFileTestCase.java 2010-02-24 17:55:59 UTC (rev 5651)
@@ -1,18 +1,18 @@
package org.picocontainer.jetty;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
import org.junit.After;
import org.junit.Test;
import org.mortbay.jetty.webapp.WebAppContext;
import org.mortbay.util.IO;
import org.picocontainer.DefaultPicoContainer;

+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class DependencyInjectionServletWarFileTestCase {

PicoJettyServer server;

Modified: java/2.x/trunk/jetty/groovy/pom.xml (5650 => 5651)

--- java/2.x/trunk/jetty/groovy/pom.xml 2010-02-24 04:34:03 UTC (rev 5650)
+++ java/2.x/trunk/jetty/groovy/pom.xml 2010-02-24 17:55:59 UTC (rev 5651)
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.9</version>
+ <version>6.1.22</version>
<scope>provided</scope>
</dependency>
<dependency>

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email