geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r520754 - in /geronimo/server/trunk: assemblies/geronimo-jetty6-jee5/ assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/ assemblies/geronimo-tomcat6-jee5/ assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/ configs/j...
Date Wed, 21 Mar 2007 05:19:28 GMT
Author: djencks
Date: Tue Mar 20 22:19:27 2007
New Revision: 520754

URL: http://svn.apache.org/viewvc?view=rev&rev=520754
Log:
Uniformize jetty/tomcat plans, assemblies

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml?view=diff&rev=520754&r1=520753&r2=520754
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml Tue Mar 20 22:19:27 2007
@@ -34,7 +34,7 @@
     <packaging>application-assembly</packaging>
 
     <description>
-        An assembly of Geronimo into a J2EE Server using Jetty as the web container.
+        An assembly of Geronimo into a JavaEE5 Server using Jetty as the web container.
     </description>
 
     <dependencies>
@@ -321,7 +321,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
- 
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>welcome-jetty</artifactId>
@@ -352,69 +352,62 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>ca-helper-jetty</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>shutdown</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>sharedlib</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-jar-configurer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-rar-configurer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-war-configurer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-ear-configurer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-clustering-builder-wadi</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency> 
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-clustering-wadi</artifactId>
+            <artifactId>openjpa</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <resources>
             <resource>
@@ -422,7 +415,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -445,7 +438,7 @@
                             <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
                         </configuration>
                     </execution>
-                    
+
                     <execution>
                         <id>unpack-schemas</id>
                         <phase>package</phase>
@@ -465,7 +458,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -492,7 +485,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
@@ -526,5 +519,5 @@
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

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=520754&r1=520753&r2=520754
==============================================================================
--- 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
Tue Mar 20 22:19:27 2007
@@ -175,7 +175,7 @@
              </attribute>
         </gbean>
     </module>
-    
+
     <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car" 
             condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') ==
'cxf'">
 
@@ -191,10 +191,10 @@
                     </dependency>
                 </dependencies>
               </environment>
-             </attribute>
+            </attribute>
         </gbean>
     </module>
-    
+
     <module name="org.apache.geronimo.configs/axis-deployer/${version}/car">
         <gbean name="AxisServiceRefBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
@@ -207,7 +207,7 @@
             <attribute name="port">25</attribute>
         </gbean>
     </module>
-    
+
     <module name="org.apache.geronimo.configs/sharedlib/${version}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml?view=diff&rev=520754&r1=520753&r2=520754
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml Tue Mar 20 22:19:27 2007
@@ -34,7 +34,7 @@
     <packaging>application-assembly</packaging>
 
     <description>
-        An assembly of Geronimo into a JEE5 Server using Tomcat as the web container.
+        An assembly of Geronimo into a JavaEE5 Server using Tomcat as the web container.
     </description>
 
     <dependencies>
@@ -193,6 +193,48 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>myfaces</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>myfaces-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>online-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>offline-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-cli</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-deploymentfactory</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>
@@ -319,20 +361,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>online-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>offline-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -351,14 +379,14 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-rar-configurer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-war-configurer</artifactId>

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=520754&r1=520753&r2=520754
==============================================================================
--- 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
Tue Mar 20 22:19:27 2007
@@ -57,7 +57,7 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/axis/${version}/car"/>
+    <module name="org.apache.geronimo.configs/axis/${version}/car" load="false"/>
     <module name="org.apache.geronimo.configs/axis2/${version}/car" load="false"/>
     <module name="org.apache.geronimo.configs/cxf/${version}/car" load="false"/>
 
@@ -87,6 +87,8 @@
 
     <module name="org.apache.geronimo.configs/activemq-ra/${version}/car"/>
 
+    <module name="org.apache.geronimo.configs/myfaces/${version}/car"/>
+
     <module name="org.apache.geronimo.configs/tomcat6/${version}/car">
         <!-- To disable accesslogging uncomment the following lines
         <gbean name="TomcatEngine">
@@ -198,7 +200,6 @@
               </environment>
             </attribute>
         </gbean>
-
     </module>
 
     <module name="org.apache.geronimo.configs/axis-deployer/${version}/car">
@@ -222,8 +223,12 @@
     </module>
 
     <module name="org.apache.geronimo.configs/tomcat6-deployer/${version}/car"/>
+        
+    <module name="org.apache.geronimo.configs/myfaces-deployer/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/welcome-tomcat/${version}/car"/>
+
+    <module name="org.apache.geronimo.configs/dojo-tomcat/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/webconsole-tomcat/${version}/car"/>
 

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=520754&r1=520753&r2=520754
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml Tue Mar 20 22:19:27 2007
@@ -25,6 +25,50 @@
         <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
         <attribute name="jettyContainerObjectName">?name=JettyWebContainer</attribute>
         <attribute name="jspServletClassName">org.apache.jasper.servlet.JspServlet</attribute>
+        <attribute name="defaultLocaleEncodingMappings">
+ar=ISO-8859-6
+be=ISO-8859-5
+bg=ISO-8859-5
+ca=ISO-8859-1
+cs=ISO-8859-2
+da=ISO-8859-1
+de=ISO-8859-1
+el=ISO-8859-7
+en=ISO-8859-1
+es=ISO-8859-1
+et=ISO-8859-1
+fi=ISO-8859-1
+fr=ISO-8859-1
+hr=ISO-8859-2
+hu=ISO-8859-2
+is=ISO-8859-1
+it=ISO-8859-1
+iw=ISO-8859-8
+ja=Shift_JIS
+ko=EUC-KR
+lt=ISO-8859-2
+lv=ISO-8859-2
+mk=ISO-8859-5
+nl=ISO-8859-1
+no=ISO-8859-1
+pl=ISO-8859-2
+pt=ISO-8859-1
+ro=ISO-8859-2
+ru=ISO-8859-5
+sh=ISO-8859-5
+sk=ISO-8859-2
+sl=ISO-8859-2
+sq=ISO-8859-2
+sr=ISO-8859-5
+sv=ISO-8859-1
+tr=ISO-8859-9
+uk=ISO-8859-5
+zh=GB2312
+zh_TW=Big5
+        </attribute>
+        <attribute name="defaultMimeTypeMappings">
+wsdl=text/xml            
+        </attribute>
         <references name="DefaultServlets">
             <pattern>
                 <name>StaticContent</name>
@@ -48,13 +92,13 @@
             </pattern>
         </references>
         <references name="WebServiceBuilder">
-			<pattern>
+            <pattern>
                 <name>CXFBuilder</name>
             </pattern>
-			<pattern>
-				<name>Axis2Builder</name>
-			</pattern>
-			<pattern>
+            <pattern>
+                <name>Axis2Builder</name>
+            </pattern>
+            <pattern>
                 <name>WebServiceBuilder</name>
             </pattern>
             <pattern>
@@ -67,9 +111,14 @@
         <reference name="ClusteringBuilders">
             <name>JettyClusteringBuilder</name>
         </reference>
-        <reference name="ModuleBuilderExtensions">
-            <name>MyFacesModuleBuilderExtension</name>
-        </reference>
+        <references name="ModuleBuilderExtensions">
+            <pattern>
+                <name>MyFacesModuleBuilderExtension</name>
+            </pattern>
+            <pattern>
+                <name>JspModuleBuilderExtension</name>
+            </pattern>
+        </references>
         <reference name="ResourceEnvironmentSetter">
             <name>ResourceRefBuilder</name>
         </reference>

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=520754&r1=520753&r2=520754
==============================================================================
--- geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml Tue Mar 20 22:19:27 2007
@@ -45,6 +45,14 @@
         <reference name="NamingBuilders">
             <name>NamingBuilders</name>
         </reference>
+        <references name="ModuleBuilderExtensions">
+            <pattern>
+                <name>MyFacesModuleBuilderExtension</name>
+            </pattern>
+            <pattern>
+                <name>JspModuleBuilderExtension</name>
+            </pattern>
+        </references>
         <reference name="ResourceEnvironmentSetter">
             <name>ResourceRefBuilder</name>
         </reference>



Mime
View raw message