geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r509288 - in /geronimo/server/trunk: ./ applications/console/geronimo-console-standard/ applications/geronimo-examples/geronimo-jsp-examples/ assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/ configs/jasper/repository/org/...
Date Mon, 19 Feb 2007 18:29:14 GMT
Author: pmcmahan
Date: Mon Feb 19 10:29:12 2007
New Revision: 509288

URL: http://svn.apache.org/viewvc?view=rev&rev=509288
Log:
GERONIMO-2804 implement JSF support
-  update the myfaces snapshot jars to avoid ELContext problem in its resolvers
-  remove references to commons-taglibs where not needed or replace with references to jstl/jstl
-  enable myfaces context listener in tomcat by providing new gbean property.  tomcat's
   default method for finding listeners in TLDs doesn't work with Geronimo's multiparent classloader.
-  add org.apache.myfaces and org.apache.taglib to non-overrideable classes for webapps
-  enable TLD processing in jetty context so that it can find the myfaces listener
-  squelch spurious WARN messages from myfaces configuration startup

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties
    geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar
    geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar.md5
    geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar
    geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar.md5
    geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml
    geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
    geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml
    geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
    geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml Mon Feb 19
10:29:12 2007
@@ -123,10 +123,9 @@
         </dependency>
         
         <!-- Used to pre compile JSPs -->
-        
         <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml Mon
Feb 19 10:29:12 2007
@@ -48,8 +48,9 @@
         </dependency>
         
         <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties
Mon Feb 19 10:29:12 2007
@@ -99,6 +99,9 @@
 log4j.logger.org.apache.myfaces.webapp.StartupServletContextListener=WARN
 log4j.logger.org.apache.myfaces.webapp.StartupServletContextListener=WARN
 
+# emits a spurious warn about null locale during startup of webapps
+log4j.logger.org.apache.myfaces.shared_impl.util.LocaleUtils=ERROR
+
 # Emits a spurious WARN during startup on /some-path/* security mappings
 log4j.logger.org.apache.catalina.deploy.SecurityCollection=ERROR
 

Modified: geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
Binary files - no diff available.

Modified: geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar.md5
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar.md5?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar.md5
(original)
+++ geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar.md5
Mon Feb 19 10:29:12 2007
@@ -1 +1 @@
-1a3a8bb9b9c2ded58afaa9d9ea12c4ae *myfaces-api-1.2.0-SNAPSHOT.jar
+0557b35bbd1edfacd3100eac88326d51 *myfaces-api-1.2.0-SNAPSHOT.jar

Modified: geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
Binary files - no diff available.

Modified: geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar.md5
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar.md5?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar.md5
(original)
+++ geronimo/server/trunk/configs/jasper/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar.md5
Mon Feb 19 10:29:12 2007
@@ -1 +1 @@
-da960f00ae1876460d403b43a26412e1 *myfaces-impl-1.2.0-SNAPSHOT.jar
+f12d9c7f33f9da98b9c185ec80cb8836 *myfaces-impl-1.2.0-SNAPSHOT.jar

Modified: geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml Mon Feb 19 10:29:12 2007
@@ -88,6 +88,8 @@
                     <filter>java.</filter>
                     <filter>javax.</filter>
                     <filter>org.apache.geronimo.</filter>
+                    <filter>org.apache.myfaces.</filter>
+                    <filter>org.apache.taglibs.</filter>
                     <filter>org.mortbay.</filter>
                     <filter>org.xml.</filter>
                     <filter>org.w3c.</filter>

Modified: geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml Mon Feb 19 10:29:12 2007
@@ -71,6 +71,7 @@
                     <filter>org.apache.catalina.</filter>
                     <filter>org.apache.tomcat.</filter>
                     <filter>org.apache.myfaces.</filter>
+                    <filter>org.apache.taglibs.</filter>
                     <filter>org.xml.</filter>
                     <filter>org.w3c.</filter>
                 </non-overridable-classes>

Modified: geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml Mon Feb 19 10:29:12 2007
@@ -39,6 +39,7 @@
     <!-- The TomcatContainer/Service -->
     <gbean name="TomcatWebContainer" class="org.apache.geronimo.tomcat.TomcatContainer">
         <attribute name="catalinaHome">var/catalina</attribute>
+        <attribute name="applicationListeners">org.apache.myfaces.webapp.StartupServletContextListener</attribute>
         <reference name="EngineGBean">
             <name>TomcatEngine</name>
         </reference>

Modified: geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/pom.xml?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/pom.xml Mon Feb 19 10:29:12 2007
@@ -173,11 +173,6 @@
         </dependency>
 
         <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>dwr</groupId>
             <artifactId>dwr</artifactId>
         </dependency>

Modified: geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml Mon Feb 19 10:29:12
2007
@@ -89,11 +89,6 @@
                     <artifactId>dwr</artifactId>
                     <type>jar</type>
                 </dependency>
-                <dependency>
-                    <groupId>taglibs</groupId>
-                    <artifactId>standard</artifactId>
-                    <type>jar</type>
-                </dependency>
               </dependencies>
               <inverse-classloading/>
             </environment>

Modified: geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/pom.xml?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/pom.xml Mon Feb 19 10:29:12 2007
@@ -177,11 +177,6 @@
         </dependency>
 
         <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>dwr</groupId>
             <artifactId>dwr</artifactId>
         </dependency>

Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml Mon Feb 19 10:29:12
2007
@@ -90,11 +90,6 @@
                     <artifactId>dwr</artifactId>
                     <type>jar</type>
                 </dependency>
-                <dependency>
-                    <groupId>taglibs</groupId>
-                    <artifactId>standard</artifactId>
-                    <type>jar</type>
-                </dependency>
               </dependencies>
               <inverse-classloading/>
             </environment>

Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
Mon Feb 19 10:29:12 2007
@@ -207,7 +207,7 @@
         this.originalSpecDD = originalSpecDD;
 //        this.handleInterceptor = handleInterceptor;
 
-        this.webAppContext.setConfigurationClasses(new String[]{});
+        this.webAppContext.setConfigurationClasses(new String[]{"org.mortbay.jetty.webapp.TagLibConfiguration"});
 
         webAppRoot = configurationBaseUrl.toString();
         this.webClassLoader = classLoader;

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
Mon Feb 19 10:29:12 2007
@@ -78,12 +78,14 @@
 
     private final Map webServices = new HashMap();
     private final String objectName;
+    private final String[] applicationListeners;
     private final WebManager manager;
     private static boolean first = true;
 
     // Required as it's referenced by deployed webapps
     public TomcatContainer() {
         this.objectName = null; // is this OK??
+        this.applicationListeners = null;
         setCatalinaHome(DEFAULT_CATALINA_HOME);
         manager = null;
     }
@@ -91,7 +93,7 @@
     /**
      * GBean constructor (invoked dynamically when the gbean is declared in a plan)
      */
-    public TomcatContainer(ClassLoader classLoader, String catalinaHome, ObjectRetriever
engineGBean, ServerInfo serverInfo, String objectName, WebManager manager) {
+    public TomcatContainer(ClassLoader classLoader, String catalinaHome, String[] applicationListeners,
ObjectRetriever engineGBean, ServerInfo serverInfo, String objectName, WebManager manager)
{
         // Register a stream handler factory for the JNDI protocol
         URLStreamHandlerFactory streamHandlerFactory =
             new DirContextURLStreamHandlerFactory();
@@ -128,6 +130,7 @@
         this.engine = (Engine) engineGBean.getInternalObject();
 
         this.objectName = objectName;
+        this.applicationListeners = applicationListeners;
         this.manager = manager;
     }
 
@@ -317,6 +320,13 @@
                 anotherCtxObj.setRealm(realm);
             }
         }
+        
+        // add application listeners to the new context
+        if (applicationListeners != null) {
+            for (String listener : applicationListeners) {
+                anotherCtxObj.addApplicationListener(listener);
+            }
+        }
 
         host.addChild(anotherCtxObj);
     }
@@ -389,11 +399,13 @@
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Web Container",
TomcatContainer.class);
 
-        infoFactory.setConstructor(new String[]{"classLoader", "catalinaHome", "EngineGBean",
"ServerInfo", "objectName", "WebManager"});
+        infoFactory.setConstructor(new String[]{"classLoader", "catalinaHome", "applicationListeners",
"EngineGBean", "ServerInfo", "objectName", "WebManager"});
 
         infoFactory.addAttribute("classLoader", ClassLoader.class, false);
 
         infoFactory.addAttribute("catalinaHome", String.class, true);
+
+        infoFactory.addAttribute("applicationListeners", String[].class, true);
 
         infoFactory.addAttribute("objectName", String.class, false);
 

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
Mon Feb 19 10:29:12 2007
@@ -173,7 +173,7 @@
         engine.doStart();
 
         ServerInfo serverInfo = new BasicServerInfo(".");
-        container = new TomcatContainer(cl, new File(BASEDIR, "target/var/catalina").toString(),
engine, serverInfo, null, null);
+        container = new TomcatContainer(cl, new File(BASEDIR, "target/var/catalina").toString(),
null, engine, serverInfo, null, null);
         container.doStart();
 
         connector = new ConnectorGBean("HTTP", null, "localhost", 8181, container);

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml Mon Feb 19 10:29:12 2007
@@ -76,11 +76,6 @@
         </dependency>
 
         <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>jstl</groupId>
             <artifactId>jstl</artifactId>
         </dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=509288&r1=509287&r2=509288
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Feb 19 10:29:12 2007
@@ -694,12 +694,6 @@
             </dependency>
 
             <dependency>
-                <groupId>taglibs</groupId>
-                <artifactId>standard</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-
-            <dependency>
                 <groupId>jstl</groupId>
                 <artifactId>jstl</artifactId>
                 <version>1.2</version>



Mime
View raw message