Author: jbohn
Date: Wed Apr 4 12:24:18 2007
New Revision: 525586
URL: http://svn.apache.org/viewvc?view=rev&rev=525586
Log:
GERONIMO-3057 - include jasper into the minimal assemblies and make the jee5 assemblies consistent
wrt jasper
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=525586&r1=525585&r2=525586
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
Wed Apr 4 12:24:18 2007
@@ -88,6 +88,7 @@
<module name="org.apache.geronimo.configs/activemq-ra/${version}/car"/>
<module name="org.apache.geronimo.configs/jasper/${version}/car" load="false"/>
+
<module name="org.apache.geronimo.configs/myfaces/${version}/car" load="false"/>
<module name="org.apache.geronimo.configs/jetty6/${version}/car">
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?view=diff&rev=525586&r1=525585&r2=525586
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Wed Apr 4 12:24:18 2007
@@ -76,6 +76,20 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper-deployer</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${version}</version>
<type>car</type>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=525586&r1=525585&r2=525586
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
Wed Apr 4 12:24:18 2007
@@ -55,6 +55,8 @@
</gbean>
</module>
+ <module name="org.apache.geronimo.configs/jasper/${version}/car" load="false"/>
+
<module name="org.apache.geronimo.configs/jetty6/${version}/car">
<gbean name="JettyWebConnector">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -83,6 +85,8 @@
<module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
<module name="org.apache.geronimo.configs/jetty6-deployer/${version}/car"/>
+
+ <module name="org.apache.geronimo.configs/jasper-deployer/${version}/car"/>
<module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${version}/car"/>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=525586&r1=525585&r2=525586
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
Wed Apr 4 12:24:18 2007
@@ -87,6 +87,8 @@
<module name="org.apache.geronimo.configs/activemq-ra/${version}/car"/>
+ <module name="org.apache.geronimo.configs/jasper/${version}/car" load="false"/>
+
<module name="org.apache.geronimo.configs/myfaces/${version}/car"/>
<module name="org.apache.geronimo.configs/tomcat6/${version}/car">
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?view=diff&rev=525586&r1=525585&r2=525586
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Wed Apr 4 12:24:18
2007
@@ -76,6 +76,20 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper-deployer</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${version}</version>
<type>car</type>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=525586&r1=525585&r2=525586
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
Wed Apr 4 12:24:18 2007
@@ -55,6 +55,8 @@
</gbean>
</module>
+ <module name="org.apache.geronimo.configs/jasper/${version}/car" load="false"/>
+
<module name="org.apache.geronimo.configs/tomcat6/${version}/car">
<gbean name="TomcatResources"/>
<gbean name="TomcatWebConnector">
@@ -84,6 +86,8 @@
<module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
<module name="org.apache.geronimo.configs/tomcat6-deployer/${version}/car"/>
+
+ <module name="org.apache.geronimo.configs/jasper-deployer/${version}/car"/>
<module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${version}/car"/>
|