geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r421990 - in /geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal: pom.xml src/main/assembly/ src/main/var/config/config.xml
Date Fri, 14 Jul 2006 19:15:41 GMT
Author: jdillon
Date: Fri Jul 14 12:15:41 2006
New Revision: 421990

URL: http://svn.apache.org/viewvc?rev=421990&view=rev
Log:
Add assembly descriptor
Change jetty to tomcat and fix up the config.xml

Added:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/
      - copied from r421963, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/
Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/pom.xml?rev=421990&r1=421989&r2=421990&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/pom.xml Fri
Jul 14 12:15:41 2006
@@ -28,11 +28,11 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-jetty-minimal</artifactId>
-    <name>Geronimo Assemblies :: Minimal + Jetty</name>
+    <artifactId>geronimo-tomcat-minimal</artifactId>
+    <name>Geronimo Assemblies :: Minimal + Tomcat</name>
     
     <description>
-        A minimal Geronimo server assembly using the Jetty web-container.
+        A minimal Geronimo server assembly using the Tomcat web-container.
     </description>
     
     <dependencies>
@@ -67,7 +67,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty</artifactId>
+            <artifactId>tomcat</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
@@ -81,7 +81,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty-deployer</artifactId>
+            <artifactId>tomcat-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
@@ -315,13 +315,13 @@
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty</artifactId>
+            <artifactId>geronimo-tomcat</artifactId>
             <version>${pom.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty-builder</artifactId>
+            <artifactId>geronimo-tomcat-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>
         

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml?rev=421990&r1=421989&r2=421990&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
Fri Jul 14 12:15:41 2006
@@ -7,7 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
-    <module name="geronimo/rmi-naming/${pom.currentVersion}/car">
+    <module name="${geronimoGroupId}/rmi-naming/${pom.version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -20,8 +20,8 @@
           <attribute name="userRepositories">[]</attribute>
         </gbean>
     </module>
-    <module name="geronimo/j2ee-server/${pom.currentVersion}/car"/>
-    <module name="geronimo/j2ee-security/${pom.currentVersion}/car">
+    <module name="${geronimoGroupId}/j2ee-server/${pom.version}/car"/>
+    <module name="${geronimoGroupId}/j2ee-security/${pom.version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -34,7 +34,7 @@
         </gbean>
     </module>
 
-    <module name="geronimo/tomcat/${pom.currentVersion}/car">
+    <module name="${geronimoGroupId}/tomcat/${pom.version}/car">
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -51,27 +51,27 @@
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
     </module>
-    <module name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
-    <module name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
+    <module name="${geronimoGroupId}/geronimo-gbean-deployer/${pom.version}/car"/>
+    <module name="${geronimoGroupId}/j2ee-deployer/${pom.version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1</attribute>
         </gbean>
     </module>
 
-    <module name="geronimo/tomcat-deployer/${pom.currentVersion}/car"/>
+    <module name="${geronimoGroupId}/tomcat-deployer/${pom.version}/car"/>
 
-    <module name="geronimo/unavailable-ejb-deployer/${pom.currentVersion}/car"/>
+    <module name="${geronimoGroupId}/unavailable-ejb-deployer/${pom.version}/car"/>
 
-    <module name="geronimo/unavailable-webservices-deployer/${pom.currentVersion}/car"/>
-    <module name="geronimo/unavailable-client-deployer/${pom.currentVersion}/car"/>
+    <module name="${geronimoGroupId}/unavailable-webservices-deployer/${pom.version}/car"/>
+    <module name="${geronimoGroupId}/unavailable-client-deployer/${pom.version}/car"/>
 
-    <module name="geronimo/sharedlib/${pom.currentVersion}/car">
+    <module name="${geronimoGroupId}/sharedlib/${pom.version}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
     </module>
 
-    <!--<module name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car"/>-->
-    <!--<module name="geronimo/hot-deployer/${pom.currentVersion}/car"/>-->
+    <!--<module name="${geronimoGroupId}/remote-deploy-tomcat/${pom.version}/car"/>-->
+    <!--<module name="${geronimoGroupId}/hot-deployer/${pom.version}/car"/>-->
 </attributes>



Mime
View raw message