geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r345207 - in /geronimo/trunk: assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/src/var/catalina/ configs/tomcat-deployer/ configs/tomcat-deployer/src/plan/ configs/tomcat/ configs/tomcat/src/plan/ modules/tomcat/
Date Thu, 17 Nov 2005 08:01:08 GMT
Author: djencks
Date: Thu Nov 17 00:01:02 2005
New Revision: 345207

URL: http://svn.apache.org/viewcvs?rev=345207&view=rev
Log:
more plan dependencies added from plugins

Added:
    geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/catalina/
Modified:
    geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/trunk/configs/tomcat-deployer/project.xml
    geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml
    geronimo/trunk/configs/tomcat/project.xml
    geronimo/trunk/configs/tomcat/src/plan/plan.xml
    geronimo/trunk/modules/tomcat/project.xml

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=345207&r1=345206&r2=345207&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml Thu Nov 17 00:01:02
2005
@@ -10,17 +10,6 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/jetty-${pom.currentVersion}.car">
-        <gbean name="JettyWebConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPPortPrimary}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
-        </gbean>
-        <gbean name="JettySSLConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
-        </gbean>
-    </configuration>
     <configuration name="geronimo/cars/j2ee-server-${pom.currentVersion}.car">
         <gbean name="openejb:type=NetworkService,name=EJB">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -78,52 +67,6 @@
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/j2ee-server-${pom.currentVersion}.car">
-        <gbean name="openejb:type=NetworkService,name=EJB">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanOpenEJBPort}</attribute>
-        </gbean>
-    </configuration>
-    <configuration name="geronimo/cars/j2ee-security-${pom.currentVersion}.car">
-        <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanRemoteLoginPort}</attribute>
-        </gbean>
-        <gbean name="JMXConnector">
-            <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
-        </gbean>
-    </configuration>
-    <configuration name="geronimo/cars/j2ee-corba-${pom.currentVersion}.car" load="false">
-        <gbean name="NameServer">
-            <attribute name="dbDir">var/cosnaming.db</attribute>
-            <attribute name="port">${PlanCOSNamingPort}</attribute>
-        </gbean>
-        <gbean name="Server">
-            <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
-        </gbean>
-        <gbean name="UnprotectedServer">
-            <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
-        </gbean>
-    </configuration>
-    <configuration name="geronimo/cars/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/cars/activemq-${pom.currentVersion}.car"/>
-    <configuration name="geronimo/cars/system-database-${pom.currentVersion}.car">
-        <gbean name="DerbyNetwork">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanDerbyPort}</attribute>
-        </gbean>
-    </configuration>
-    <configuration name="geronimo/cars/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/cars/geronimo-gbean-deployer-${pom.currentVersion}.car"/>
     <configuration name="geronimo/cars/j2ee-deployer-${pom.currentVersion}.car">
         <gbean name="WebBuilder">
@@ -136,4 +79,5 @@
     <configuration name="geronimo/cars/jetty-deployer-${pom.currentVersion}.car"/>
     <configuration name="geronimo/cars/welcome-jetty-${pom.currentVersion}.car"/>
     <configuration name="geronimo/cars/webconsole-jetty-${pom.currentVersion}.car"/>
+    <configuration name="geronimo/cars/uddi-jetty-${pom.currentVersion}.car"/>
 </attributes>

Modified: geronimo/trunk/configs/tomcat-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat-deployer/project.xml?rev=345207&r1=345206&r2=345207&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/project.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/project.xml Thu Nov 17 00:01:02 2005
@@ -20,8 +20,7 @@
 
 <project>
     <pomVersion>3</pomVersion>
-    <extend>../j2ee-deployer/project.xml</extend>
-<!--    <extend>../../etc/project.xml</extend>-->
+    <extend>../../etc/project.xml</extend>
     <id>tomcat-deployer</id>
     <name>Tomcat Deployer Configuration for the J2EE Server</name>
 
@@ -29,21 +28,32 @@
         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>tomcat</artifactId>
+            <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                 <geronimo.import>true</geronimo.import>
+             </properties>
         </dependency>
+
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-system</artifactId>
+            <artifactId>tomcat</artifactId>
             <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                 <geronimo.import>true</geronimo.import>
+             </properties>
         </dependency>
 
+        <!-- plan dependency -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>j2ee-deployer</artifactId>
+            <artifactId>geronimo-tomcat-builder</artifactId>
             <version>${geronimo_version}</version>
-            <type>car</type>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml?rev=345207&r1=345206&r2=345207&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml Thu Nov 17 00:01:02 2005
@@ -21,16 +21,7 @@
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
                configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
-               parentId="${pom.groupId}/cars/j2ee-deployer-${pom.currentVersion}.car"
     >
-
-    <import>
-        <uri>${pom.groupId}/cars/tomcat-${pom.currentVersion}.car</uri>
-    </import>
-
-    <dependency>
-        <uri>geronimo/jars/geronimo-tomcat-builder-${geronimo_version}.jar</uri>
-    </dependency>
 
     <gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
         <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car,${pom.groupId}/cars/tomcat-${pom.currentVersion}.car</attribute>

Modified: geronimo/trunk/configs/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat/project.xml?rev=345207&r1=345206&r2=345207&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/project.xml (original)
+++ geronimo/trunk/configs/tomcat/project.xml Thu Nov 17 00:01:02 2005
@@ -25,6 +25,13 @@
     <name>Tomcat Configuration for the J2EE Server</name>
 
     <dependencies>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+
         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>
@@ -35,17 +42,14 @@
                  <geronimo.import>true</geronimo.import>
              </properties>
         </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${geronimo_version}</version>
-        </dependency>
 
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <artifactId>geronimo-tomcat</artifactId>
             <version>${geronimo_version}</version>
-            <type>car</type>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
         </dependency>
 
         <dependency>
@@ -191,11 +195,6 @@
             <version>${activeio_version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
-            <version>${jetty_version}</version>
-        </dependency>
     </dependencies>
 </project>
 

Modified: geronimo/trunk/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat/src/plan/plan.xml?rev=345207&r1=345206&r2=345207&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat/src/plan/plan.xml Thu Nov 17 00:01:02 2005
@@ -26,73 +26,6 @@
                configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
     >
 
-    <dependency>
-        <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/catalina-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/catalina-cluster-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/catalina-optional-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/tomcat-coyote-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/tomcat-http-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/tomcat-util-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/naming-resources-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/servlets-default-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/servlets-invoker-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>commons-beanutils/jars/commons-beanutils-${commons_beanutils_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>commons-collections/jars/commons-collections-${commons_collections_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>commons-digester/jars/commons-digester-${commons_digester_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>commons-modeler/jars/commons-modeler-${commons_modeler_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>mx4j/jars/mx4j-${mx4j_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/jasper-compiler-${jasper_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/jasper-compiler-jdt-${jasper_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/jasper-runtime-${jasper_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/tomcat-ajp-${tomcat_ajp_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
-    </dependency>
-
     <!-- david jencks is not convinced that this gbean should be in this plan and thinks
it might
     belong in the console plan -->
     <gbean name="TomcatWebManager" class="org.apache.geronimo.tomcat.TomcatManagerImpl">

Modified: geronimo/trunk/modules/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/project.xml?rev=345207&r1=345206&r2=345207&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/project.xml (original)
+++ geronimo/trunk/modules/tomcat/project.xml Thu Nov 17 00:01:02 2005
@@ -196,6 +196,15 @@
         </dependency>
         <dependency>
             <groupId>tomcat</groupId>
+            <artifactId>tomcat-ajp</artifactId>
+            <version>${tomcat_version}</version>
+            <url>http://jakarta.apache.org/tomcat/</url>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>tomcat</groupId>
             <artifactId>catalina-cluster</artifactId>
             <version>${tomcat_version}</version>
             <url>http://jakarta.apache.org/tomcat/</url>



Mime
View raw message