You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2007/04/27 20:09:37 UTC
svn commit: r533182 - in /geronimo/server/trunk: configs/jasper-deployer/
configs/jasper-deployer/src/plan/ configs/jetty6-deployer/src/plan/
configs/tomcat6-deployer/src/plan/
modules/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/de...
Author: jbohn
Date: Fri Apr 27 11:09:36 2007
New Revision: 533182
URL: http://svn.apache.org/viewvc?view=rev&rev=533182
Log:
GERONIMO-3051 - revert 532106 changes now that 533154 is integrated
Modified:
geronimo/server/trunk/configs/jasper-deployer/pom.xml
geronimo/server/trunk/configs/jasper-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.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=533182&r1=533181&r2=533182
==============================================================================
--- geronimo/server/trunk/configs/jasper-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jasper-deployer/pom.xml Fri Apr 27 11:09:36 2007
@@ -55,12 +55,6 @@
<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=533182&r1=533181&r2=533182
==============================================================================
--- geronimo/server/trunk/configs/jasper-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jasper-deployer/src/plan/plan.xml Fri Apr 27 11:09:36 2007
@@ -32,10 +32,6 @@
<artifactId>jasper</artifactId>
<type>car</type>
</dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
</dependencies>
</environment>
</xml-attribute>
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=533182&r1=533181&r2=533182
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml Fri Apr 27 11:09:36 2007
@@ -137,6 +137,7 @@
<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=533182&r1=533181&r2=533182
==============================================================================
--- geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml Fri Apr 27 11:09:36 2007
@@ -80,6 +80,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/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=533182&r1=533181&r2=533182
==============================================================================
--- 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 Fri Apr 27 11:09:36 2007
@@ -105,12 +105,6 @@
}
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 {
@@ -124,6 +118,8 @@
//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();