geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r371771 - in /geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server: ./ project.xml src/var/config/config.xml
Date Tue, 24 Jan 2006 02:00:34 GMT
Author: djencks
Date: Mon Jan 23 18:00:32 2006
New Revision: 371771

URL: http://svn.apache.org/viewcvs?rev=371771&view=rev
Log:
GERONIMO-1427, even smaller tomcat server

Added:
    geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/
      - copied from r371766, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/
Modified:
    geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/project.xml
    geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/config/config.xml

Modified: geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/project.xml?rev=371771&r1=371766&r2=371771&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/project.xml (original)
+++ geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/project.xml Mon Jan 23
18:00:32 2006
@@ -20,9 +20,9 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>geronimo-tomcat-jms</id>
-    <name>Geronimo Assembly for a Web Server running Tomcat and JMS</name>
-    <description>An assembly of Geronimo into a Web Server using Tomcat for the web
container and ActiveMQQ for JMS</description>
+    <id>geronimo-tomcat</id>
+    <name>Geronimo Assembly for a Web Server running Tomcat</name>
+    <description>An assembly of Geronimo into a Web Server using Tomcat for the web
container</description>
 
     <dependencies>
         <!-- plugin we use --> 
@@ -80,94 +80,7 @@
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
-        <!--
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>directory</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>ldap-realm</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>system-database</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>activemq-broker</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>activemq</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-<!-- client -->
-        <!--
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>client-system</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-                <geronimo.assemble.executable>bin/client.jar</geronimo.assemble.executable>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>client</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>client-security</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>client-corba</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        -->
-<!--deployers-->
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
@@ -177,15 +90,15 @@
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>hot-deployer</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>geronimo</groupId>-->
+            <!--<artifactId>hot-deployer</artifactId>-->
+            <!--<type>car</type>-->
+            <!--<version>${pom.currentVersion}</version>-->
+            <!--<properties>-->
+                <!--<geronimo.assemble>install</geronimo.assemble>-->
+            <!--</properties>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
@@ -232,82 +145,15 @@
             </properties>
         </dependency>
 <!--applications-->
-        <!--
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>ldap-demo-tomcat</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>welcome-tomcat</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>servlets-examples-tomcat</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>jsp-examples-tomcat</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>webconsole-tomcat</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>jmxdebug-tomcat</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>remote-deploy-tomcat</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <!--
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>uddi-tomcat</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        -->
+        <!--<dependency>-->
+            <!--<groupId>geronimo</groupId>-->
+            <!--<artifactId>remote-deploy-tomcat</artifactId>-->
+            <!--<type>car</type>-->
+            <!--<version>${pom.currentVersion}</version>-->
+            <!--<properties>-->
+                <!--<geronimo.assemble>install</geronimo.assemble>-->
+            <!--</properties>-->
+        <!--</dependency>-->
 
         <!-- unpack --> 
         <dependency>
@@ -513,9 +359,7 @@
         </dependency>
 
 
-        <!-- packages we include for others to use, mostly rars -->
-        <dependency>
-            <!-- included to make additional deployments easier -->
+        <!--<dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq-ra</artifactId>
             <version>${activemq_version}</version>
@@ -534,8 +378,8 @@
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
-
-        <dependency>
+-->
+        <!--<dependency>
             <groupId>tranql</groupId>
             <artifactId>tranql-connector-derby-embed-local</artifactId>
             <version>${tranql_vendors_version}</version>
@@ -587,8 +431,9 @@
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
-
+-->
         <!-- all our specs.  These should be all included via transitive dependencies
but most arent -->
+<!--
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.0.2_spec</artifactId>
@@ -597,6 +442,7 @@
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
+-->
 <!--
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -617,6 +463,7 @@
             </properties>
         </dependency>
         -->
+<!--
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
@@ -625,6 +472,7 @@
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
+-->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
@@ -687,6 +535,7 @@
             </properties>
         </dependency>
 -->
+<!--
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -695,6 +544,7 @@
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
+-->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jsp_2.0_spec</artifactId>

Modified: geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/config/config.xml?rev=371771&r1=371766&r2=371771&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/config/config.xml
(original)
+++ geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/config/config.xml
Mon Jan 23 18:00:32 2006
@@ -27,28 +27,6 @@
         </gbean>
     </configuration>
 
-    <configuration name="geronimo/activemq-broker/${pom.currentVersion}/car">
-        <gbean name="ActiveMQ.tcp.default">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanActiveMQPort}</attribute>
-        </gbean>
-    </configuration>
-    <configuration name="geronimo/activemq/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/system-database/${pom.currentVersion}/car">
-        <gbean name="DerbyNetwork">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanDerbyPort}</attribute>
-        </gbean>
-    </configuration>
-    <!--
-    <configuration name="geronimo/directory/${pom.currentVersion}/car">
-        <gbean name="geronimo.server:name=DirectoryService">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanLdapPort}</attribute>
-        </gbean>
-    </configuration>
-    <configuration name="geronimo/ldap-realm/${pom.currentVersion}/car"/>
-    -->
     <configuration name="geronimo/tomcat/${pom.currentVersion}/car">
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
@@ -73,23 +51,16 @@
         </gbean>
     </configuration>
 
-    <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car">
+        <gbean name="TomcatWebBuilder">
+            <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car,${pom.groupId}/tomcat/${pom.currentVersion}/car</attribute>
+        </gbean>
+    </configuration>
     <configuration name="geronimo/unavailable-ejb-deployer/${pom.currentVersion}/car"/>
 
     <configuration name="geronimo/unavailable-webservices-deployer/${pom.currentVersion}/car"/>
     <configuration name="geronimo/unavailable-client-deployer/${pom.currentVersion}/car"/>
 
-    <configuration name="geronimo/welcome-tomcat/${pom.currentVersion}/car"/>
-    <!--
-    <configuration name="geronimo/ldap-demo-tomcat/${pom.currentVersion}/car"/>
-    -->
-    <configuration name="geronimo/servlets-examples-tomcat/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/jsp-examples-tomcat/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/webconsole-tomcat/${pom.currentVersion}/car"/>
-    <!--
-    <configuration name="geronimo/uddi-tomcat/${pom.currentVersion}/car"/>
-    -->
-    <configuration name="geronimo/jmxdebug-tomcat/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car"/>
+    <!--<configuration name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car"/>-->
+    <!--<configuration name="geronimo/hot-deployer/${pom.currentVersion}/car"/>-->
 </attributes>



Mime
View raw message