You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gd...@apache.org on 2008/01/07 12:11:41 UTC
svn commit: r609571 - in /geronimo/server/trunk/plugins:
clustering/wadi-clustering/
jetty/geronimo-jetty6-clustering-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/
jetty/geronimo-jetty6/
jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/...
Author: gdamour
Date: Mon Jan 7 03:11:35 2008
New Revision: 609571
URL: http://svn.apache.org/viewvc?rev=609571&view=rev
Log:
* move classes depending on geronimo-clustering from geronimo-jetty6 to
geronimo-jetty6-clustering-wadi;
* remove geronimo-clustering dependency from geronimo-jetty6;
* do not load clustering-wadi configuration.
This way the clustering config. does not need to be used when clustering
is actually not used.
This fixes the Jetty part of GERONIMO-3721 WADI modules prevent Geronimo
from starting when offline
Added:
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/AbstractClusteredPreHandler.java
- copied unchanged from r609487, geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/AbstractClusteredPreHandler.java
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionHandler.java
- copied unchanged from r609487, geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionHandler.java
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionHandlerFactory.java
- copied unchanged from r609487, geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionHandlerFactory.java
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionManager.java
- copied unchanged from r609487, geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionManager.java
Removed:
geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/
Modified:
geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml
geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ApplicationTest.java
geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/jetty/jetty6/pom.xml
Modified: geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml?rev=609571&r1=609570&r2=609571&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml Mon Jan 7 03:11:35 2008
@@ -106,7 +106,7 @@
<category>Clustering</category>
<instance>
<plugin-artifact>
- <config-xml-content>
+ <config-xml-content load="false">
<gbean name="DefaultBackingStrategyFactory">
<attribute name="nbReplica">#{ReplicaCount}</attribute>
</gbean>
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml?rev=609571&r1=609570&r2=609571&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml Mon Jan 7 03:11:35 2008
@@ -54,12 +54,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-clustering</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</dependency>
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=609571&r1=609570&r2=609571&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 Jan 7 03:11:35 2008
@@ -22,19 +22,13 @@
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
-import java.util.Collections;
-import java.util.Set;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.geronimo.clustering.Node;
-import org.apache.geronimo.clustering.Session;
-import org.apache.geronimo.clustering.SessionAlreadyExistException;
-import org.apache.geronimo.clustering.SessionListener;
-import org.apache.geronimo.clustering.SessionManager;
-import org.apache.geronimo.jetty6.cluster.ClusteredSessionHandlerFactory;
+import org.mortbay.jetty.servlet.SessionHandler;
+
/**
* @version $Rev$ $Date$
@@ -54,9 +48,8 @@
}
public void testApplicationWithSessionHandler() throws Exception {
- SessionManager sessionManager = new MockSessionManager();
preHandlerFactory = new MockPreHandlerFactory();
- sessionHandlerFactory = new ClusteredSessionHandlerFactory(sessionManager);
+ sessionHandlerFactory = new MockSessionHandlerFactory();
JettyWebAppContext app = setUpAppContext(null, null, null, null, null, null, null, "war1/");
setUpStaticContentServlet(app);
@@ -68,39 +61,6 @@
connection.disconnect();
}
- private static class MockSessionManager implements SessionManager {
-
- Node node = new Node() {
-
- public javax.management.remote.JMXConnector getJMXConnector() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- public String getName() {
- return "name";
- }
-
- };
-
- public Session createSession(String string) throws SessionAlreadyExistException {
- return null;
- }
-
- public void registerListener(SessionListener sessionListener) {
- }
-
- public void unregisterListener(SessionListener sessionListener) {
- }
-
- public Node getNode() {
- return node;
- }
-
- public Set<Node> getRemoteNodes() {
- return Collections.EMPTY_SET;
- }
- }
-
public class MockPreHandlerFactory implements PreHandlerFactory {
public PreHandler createHandler() {
return new AbstractPreHandler() {
@@ -115,5 +75,10 @@
}
+ public class MockSessionHandlerFactory implements SessionHandlerFactory {
+ public SessionHandler createHandler(PreHandler preHandler) {
+ return new SessionHandler();
+ }
+ }
}
Modified: geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml?rev=609571&r1=609570&r2=609571&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml Mon Jan 7 03:11:35 2008
@@ -68,6 +68,11 @@
<includeVersion>true</includeVersion>
</useMavenDependencies>
<category>Jetty</category>
+ <instance>
+ <plugin-artifact>
+ <config-xml-content load="false"/>
+ </plugin-artifact>
+ </instance>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/plugins/jetty/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6/pom.xml?rev=609571&r1=609570&r2=609571&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6/pom.xml Mon Jan 7 03:11:35 2008
@@ -66,13 +66,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>clustering</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -148,12 +141,6 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jetty6</artifactId>
<type>jar</type>
- </dependency>
- <dependency start="true">
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>clustering</artifactId>
- <type>car</type>
- <import>classes</import>
</dependency>
<dependency start="true">
<groupId>org.slf4j</groupId>