geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r532106 - in /geronimo/server/trunk: configs/jasper-deployer/ configs/jasper-deployer/src/plan/ configs/jee-specs/ configs/jetty6-deployer/src/plan/ configs/tomcat6-deployer/src/plan/ configs/webconsole-tomcat/ modules/geronimo-jasper-build...
Date Tue, 24 Apr 2007 22:13:58 GMT
Author: jbohn
Date: Tue Apr 24 15:13:57 2007
New Revision: 532106

URL: http://svn.apache.org/viewvc?view=rev&rev=532106
Log:
GERONIMO-3051 Fix DB Viewer portlet error - patch from Frank G with a tweak to the jasper
builder so things will build

Modified:
    geronimo/server/trunk/configs/jasper-deployer/pom.xml
    geronimo/server/trunk/configs/jasper-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/jee-specs/pom.xml
    geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
    geronimo/server/trunk/modules/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java

Modified: geronimo/server/trunk/configs/jasper-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper-deployer/pom.xml?view=diff&rev=532106&r1=532105&r2=532106
==============================================================================
--- geronimo/server/trunk/configs/jasper-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jasper-deployer/pom.xml Tue Apr 24 15:13:57 2007
@@ -55,6 +55,12 @@
             <artifactId>geronimo-jasper-builder</artifactId>
             <version>${version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/configs/jasper-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper-deployer/src/plan/plan.xml?view=diff&rev=532106&r1=532105&r2=532106
==============================================================================
--- geronimo/server/trunk/configs/jasper-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jasper-deployer/src/plan/plan.xml Tue Apr 24 15:13:57 2007
@@ -32,6 +32,10 @@
                         <artifactId>jasper</artifactId>
                         <type>car</type>
                     </dependency>
+                    <dependency>
+                        <groupId>jstl</groupId>
+                        <artifactId>jstl</artifactId>
+                    </dependency>
                 </dependencies>
             </environment>
         </xml-attribute>

Modified: geronimo/server/trunk/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jee-specs/pom.xml?view=diff&rev=532106&r1=532105&r2=532106
==============================================================================
--- geronimo/server/trunk/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/configs/jee-specs/pom.xml Tue Apr 24 15:13:57 2007
@@ -154,11 +154,6 @@
             <artifactId>myfaces-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-        </dependency>
-
         <!-- build order hint -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

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=532106&r1=532105&r2=532106
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml Tue Apr 24 15:13:57 2007
@@ -137,7 +137,6 @@
                     <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=532106&r1=532105&r2=532106
==============================================================================
--- geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml Tue Apr 24 15:13:57 2007
@@ -80,7 +80,6 @@
                     <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/webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/pom.xml?view=diff&rev=532106&r1=532105&r2=532106
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/pom.xml Tue Apr 24 15:13:57 2007
@@ -78,6 +78,7 @@
             <artifactId>tomcat6-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -200,13 +201,6 @@
             <artifactId>xercesImpl</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java?view=diff&rev=532106&r1=532105&r2=532106
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
Tue Apr 24 15:13:57 2007
@@ -105,6 +105,12 @@
     }
 
     public void createModule(Module module, Object plan, JarFile moduleFile, String targetPath,
URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming
naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+        if (!(module instanceof WebModule)) {
+            //not a web module, nothing to do
+            return;
+        }
+        //TODO Only merge if we detect jsps???
+        EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module module, Collection
configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws
DeploymentException {
@@ -118,8 +124,6 @@
             //not a web module, nothing to do
             return;
         }
-        //TODO Only merge if we detect jsps???
-        EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
 
         WebModule webModule = (WebModule) module;
         WebAppType webApp = (WebAppType) webModule.getSpecDD();



Mime
View raw message