geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r421973 - in /geronimo/sandbox/svkmerge/m2migration/m2-assemblies: geronimo-jetty-minimal/pom.xml geronimo-jetty-minimal/project.xml geronimo-jetty-minimal/src/main/var/config/config.xml pom.xml
Date Fri, 14 Jul 2006 18:12:11 GMT
Author: jdillon
Date: Fri Jul 14 11:12:11 2006
New Revision: 421973

URL: http://svn.apache.org/viewvc?rev=421973&view=rev
Log:
Adding mostly functional geronimo-jetty-minimal assembly

Removed:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/project.xml
Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/pom.xml?rev=421973&r1=421972&r2=421973&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/pom.xml Fri
Jul 14 11:12:11 2006
@@ -28,11 +28,11 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-jetty-j2ee</artifactId>
-    <name>Geronimo Assemblies :: J2EE + Jetty</name>
+    <artifactId>geronimo-jetty-minimal</artifactId>
+    <name>Geronimo Assemblies :: Minimal + Jetty</name>
     
     <description>
-        An assembly of Geronimo into a J2EE Server using Jetty as the web container.
+        A minimal Geronimo server assembly using the Jetty web-container.
     </description>
     
     <dependencies>
@@ -67,27 +67,6 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-corba</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
@@ -95,76 +74,6 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>directory</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>ldap-realm</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <!--dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq-broker</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency-->
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-system</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-security</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-corba</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>javamail</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
@@ -172,126 +81,42 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis-deployer</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-deployer</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>hot-deployer</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
         
-        <!-- dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>ldap-demo-jetty</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency  -->
-        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>welcome-jetty</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <!--dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>servlets-examples-jetty</artifactId>
+            <artifactId>shutdown</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsp-examples-jetty</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency-->
-        
-        <!--dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>webconsole-jetty</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency-->
-        
-        <!--dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jmxdebug-jetty</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency-->
-        
-        <!--dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>remote-deploy-jetty</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency-->
-        
-        <!--dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>uddi-jetty</artifactId>
+            <artifactId>sharedlib</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>daytrader-derby-jetty</artifactId>
+            <artifactId>unavailable-client-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>daytrader-derby-jetty-streamer-client</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency-->
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>shutdown</artifactId>
+            <artifactId>unavailable-webservices-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>online-deployer</artifactId>
+            <artifactId>unavailable-ejb-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml?rev=421973&r1=421972&r2=421973&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
Fri Jul 14 11:12:11 2006
@@ -7,7 +7,8 @@
 <!-- ======================================================== -->
 
 <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 +21,10 @@
           <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 +37,7 @@
         </gbean>
     </module>
 
-    <module name="geronimo/jetty/${pom.currentVersion}/car">
+    <module name="${geronimoGroupId}/jetty/${pom.version}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -49,27 +52,32 @@
             <attribute name="port">8009</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/jetty-1.1</attribute>
         </gbean>
     </module>
 
-    <module name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
+    <module name="${geronimoGroupId}/jetty-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-jetty/${pom.currentVersion}/car" />-->
-    <!--<module name="geronimo/hot-deployer/${pom.currentVersion}/car"/>-->
+    <!--<module name="${geronimoGroupId}/remote-deploy-jetty/${pom.version}/car" />-->
+    
+    <!--<module name="${geronimoGroupId}/hot-deployer/${pom.version}/car"/>-->
+    
 </attributes>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml?rev=421973&r1=421972&r2=421973&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml Fri Jul 14 11:12:11 2006
@@ -110,7 +110,11 @@
     
     <modules>
       <module>geronimo-jetty-j2ee</module>
+      <module>geronimo-jetty-minimal</module>
       <module>geronimo-tomcat-j2ee</module>
+      <!--
+      <module>geronimo-tomcat-minimal</module>
+      -->
     </modules>
     
 </project>



Mime
View raw message