geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gr...@apache.org
Subject svn commit: rev 51859 - in geronimo/trunk: . etc modules/assembly modules/jetty modules/jetty/src/etc/META-INF modules/jetty/src/java/org/apache/geronimo/jetty
Date Mon, 04 Oct 2004 00:09:01 GMT
Author: gregw
Date: Sun Oct  3 17:09:00 2004
New Revision: 51859

Modified:
   geronimo/trunk/etc/version-info.ent
   geronimo/trunk/modules/assembly/project.properties
   geronimo/trunk/modules/jetty/project.properties
   geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyXMLConfiguration.java
   geronimo/trunk/project.properties
Log:

Added www.mortbay.org/maven repository
Use Jetty-5.1.G0 from that repository
Updated to use new-improved webapp Configuration mechanism
Updated to use new-improved doStart mechanism
TODO - more code should be moved from the doStart methods to Configuration instances.



Modified: geronimo/trunk/etc/version-info.ent
==============================================================================
--- geronimo/trunk/etc/version-info.ent	(original)
+++ geronimo/trunk/etc/version-info.ent	Sun Oct  3 17:09:00 2004
@@ -37,7 +37,7 @@
 <!ENTITY howl-version "0.1.7">
 <!ENTITY hsqldb-version "1.7.1">
 <!ENTITY jelly-velocity-tags-version "SNAPSHOT">
-<!ENTITY jetty-version "5.0.1-G1">
+<!ENTITY jetty-version "5.1.G0">
 <!ENTITY jaxb-ri-version "SNAPSHOT">
 <!ENTITY junit-version "3.8">
 <!ENTITY log4j-version "1.2.8">

Modified: geronimo/trunk/modules/assembly/project.properties
==============================================================================
--- geronimo/trunk/modules/assembly/project.properties	(original)
+++ geronimo/trunk/modules/assembly/project.properties	Sun Oct  3 17:09:00 2004
@@ -5,4 +5,4 @@
 # the directory containing the geronimo website in CVS
 
 geronimo.cvs.docdir = ../incubator-site/build/site/projects/geronimo
-maven.repo.remote=http://www.apache.org/~jlaskowski/maven, http://www.openejb.org/maven,
http://www.apache.org/~djencks/maven, http://dist.codehaus.org, http://www.ibiblio.org/maven,
http://www.apache.org/~chirino/maven
+maven.repo.remote=http://www.apache.org/~jlaskowski/maven, http://www.mortbay.org/maven,
http://www.openejb.org/maven, http://www.apache.org/~djencks/maven, http://dist.codehaus.org,
http://www.ibiblio.org/maven, http://www.apache.org/~chirino/maven

Modified: geronimo/trunk/modules/jetty/project.properties
==============================================================================
--- geronimo/trunk/modules/jetty/project.properties	(original)
+++ geronimo/trunk/modules/jetty/project.properties	Sun Oct  3 17:09:00 2004
@@ -4,7 +4,7 @@
 
 # the directory containing the geronimo website in CVS
 
-maven.repo.remote=http://www.apache.org/~jlaskowski/maven, http://www.openejb.org/maven,
http://dist.codehaus.org, http://www.ibiblio.org/maven
+maven.repo.remote=http://www.apache.org/~jlaskowski/maven, http://www.mortbay.org/maven,
http://www.openejb.org/maven, http://dist.codehaus.org, http://www.ibiblio.org/maven
 
 maven.junit.jvmargs=-Djava.security.auth.login.config=src/test-resources/data/login.config
 maven.junit.fork=true

Modified: geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml
==============================================================================
--- geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml	(original)
+++ geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml	Sun Oct  3 17:09:00
2004
@@ -18,7 +18,7 @@
   
 <service xmlns="http://geronimo.apache.org/xml/ns/deployment">
     <dependency>
-        <uri>jetty/jars/org.mortbay.jetty-5.0.1-G1.jar</uri>
+        <uri>jetty/jars/org.mortbay.jetty-5.1.G0.jar</uri>
     </dependency>
     <dependency>
         <uri>tomcat/jars/jasper-compiler-5.0.28.jar</uri>

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
Sun Oct  3 17:09:00 2004
@@ -100,7 +100,7 @@
         this.userTransaction = userTransaction;
         this.classLoader = classLoader;
 
-        setConfiguration(new JettyXMLConfiguration(this));
+        setConfigurationClassNames(new String[]{"org.apache.geronimo.jetty.JettyXMLConfiguration"});
     }
 
     /**
@@ -186,6 +186,13 @@
 
     public void doStart() throws WaitingException, Exception {
 
+        // merge Geronimo and Jetty Lifecycles
+        if (!isStarting())
+        {
+            super.start();
+            return;
+        }
+        
         if (uri.isAbsolute()) {
             setWAR(uri.toString());
         } else {
@@ -216,7 +223,7 @@
                     throw new RuntimeException(e);
                 }
 
-                super.start();
+                super.doStart();
             } finally {
                 try {
                     associator.exit(oldInstanceContext);
@@ -235,8 +242,15 @@
         log.info("JettyWebAppContext started");
     }
 
-    public void doStop() throws WaitingException, Exception {
+    public void doStop() throws Exception {
 
+        // merge Geronimo and Jetty Lifecycles
+        if (!isStopping())
+        {
+            super.stop();
+            return;
+        }
+        
         ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
         try {
             Thread.currentThread().setContextClassLoader(classLoader);
@@ -260,7 +274,7 @@
 
                 while (true) {
                     try {
-                        super.stop();
+                        super.doStop();
                         break;
                     } catch (InterruptedException e) {
                         continue;

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java
(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java
Sun Oct  3 17:09:00 2004
@@ -114,9 +114,6 @@
 
         this.policyContextID = policyContextID;
         this.securityConfig = securityConfig;
-
-        setConfiguration(new JettyXMLConfiguration(this));
-
         defaultPrincipal = generateDefaultPrincipal(securityConfig);
 
         /**
@@ -403,7 +400,12 @@
             factory = PolicyConfigurationFactory.getPolicyConfigurationFactory();
 
             policyConfiguration = factory.getPolicyConfiguration(policyContextID, true);
-            ((JettyXMLConfiguration) this.getConfiguration()).configure(policyConfiguration,
securityConfig);
+            Configuration[] configurations = getConfigurations();
+            for (int i=0;i<configurations.length;i++)
+            {
+                if (configurations[i] instanceof JettyXMLConfiguration)
+                    ((JettyXMLConfiguration)configurations[i]).configure(policyConfiguration,
securityConfig);
+            }
             policyConfiguration.commit();
         } catch (ClassNotFoundException e) {
             // do nothing

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyXMLConfiguration.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyXMLConfiguration.java
(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyXMLConfiguration.java
Sun Oct  3 17:09:00 2004
@@ -68,10 +68,6 @@
     private Map servletRoles = new HashMap();
 
 
-    public JettyXMLConfiguration(JettyWebAppContext context) {
-        super(context);
-    }
-
     protected void initialize(XmlParser.Node config) throws ClassNotFoundException, UnavailableException
{
         super.initialize(config);
 

Modified: geronimo/trunk/project.properties
==============================================================================
--- geronimo/trunk/project.properties	(original)
+++ geronimo/trunk/project.properties	Sun Oct  3 17:09:00 2004
@@ -19,7 +19,7 @@
 # the directory containing the geronimo website in CVS
 
 geronimo.cvs.docdir = ../incubator-site/build/site/projects/geronimo
-maven.repo.remote=http://dist.codehaus.org, http://www.ibiblio.org/maven
+maven.repo.remote=http://dist.codehaus.org, http://www.mortbay.org/maven, http://www.ibiblio.org/maven
 module.excludes=axis
 #maven.test.failure.ignore=true
 maven.remote.group=apcvs

Mime
View raw message