You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/11/17 03:06:06 UTC
svn commit: r345166 - in /geronimo/trunk: assemblies/j2ee-tomcat-server/
assemblies/j2ee-tomcat-server/src/var/config/ configs/console-jetty/
configs/console-jetty/src/plan/ configs/console-tomcat/
configs/console-tomcat/src/plan/ configs/j2ee-deployer...
Author: djencks
Date: Wed Nov 16 18:05:56 2005
New Revision: 345166
URL: http://svn.apache.org/viewcvs?rev=345166&view=rev
Log:
Initial work on a tomcat server. Starts but won't serve pages
Added:
geronimo/trunk/assemblies/j2ee-tomcat-server/
- copied from r345114, geronimo/trunk/assemblies/j2ee-jetty-server/
Modified:
geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
geronimo/trunk/configs/console-jetty/project.xml
geronimo/trunk/configs/console-jetty/src/plan/plan.xml
geronimo/trunk/configs/console-tomcat/project.properties
geronimo/trunk/configs/console-tomcat/project.xml
geronimo/trunk/configs/console-tomcat/src/plan/plan.xml
geronimo/trunk/configs/j2ee-deployer/src/plan/plan.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/configs/uddi-tomcat/project.properties
geronimo/trunk/configs/uddi-tomcat/project.xml
geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml
geronimo/trunk/configs/welcome-jetty/project.xml
geronimo/trunk/configs/welcome-tomcat/project.properties
geronimo/trunk/configs/welcome-tomcat/project.xml
geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml
Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=345166&r1=345114&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Wed Nov 16 18:05:56 2005
@@ -73,7 +73,7 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>jetty</artifactId>
+ <artifactId>tomcat</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -136,7 +136,7 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>jetty-deployer</artifactId>
+ <artifactId>tomcat-deployer</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -145,7 +145,7 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>welcome-jetty</artifactId>
+ <artifactId>welcome-tomcat</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -154,7 +154,7 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>webconsole-jetty</artifactId>
+ <artifactId>webconsole-tomcat</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -163,7 +163,7 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>uddi-jetty</artifactId>
+ <artifactId>uddi-tomcat</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=345166&r1=345114&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml Wed Nov 16 18:05:56 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>
@@ -67,61 +56,20 @@
<attribute name="port">${PlanLdapPort}</attribute>
</gbean>
</configuration>
- <configuration name="geronimo/cars/jetty-${pom.currentVersion}.car">
- <gbean name="JettyWebConnector">
+ <configuration name="geronimo/cars/tomcat-${pom.currentVersion}.car">
+ <gbean name="TomcatWebConnector">
<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>
- <attribute name="port">${PlanOpenEJBPort}</attribute>
- </gbean>
- </configuration>
- <configuration name="geronimo/cars/j2ee-security-${pom.currentVersion}.car">
- <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
+ <gbean name="TomcatAJPConnector">
<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>
+ <attribute name="port">${PlanAJPPortPrimary}</attribute>
+ <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
</gbean>
- </configuration>
- <configuration name="geronimo/cars/directory-${pom.currentVersion}.car">
- <gbean name="geronimo.server:name=DirectoryService">
+ <gbean name="TomcatWebSSLConnector">
<attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanLdapPort}</attribute>
+ <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
</gbean>
</configuration>
<configuration name="geronimo/cars/geronimo-gbean-deployer-${pom.currentVersion}.car"/>
@@ -133,7 +81,8 @@
<attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
</gbean>
</configuration>
- <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/tomcat-deployer-${pom.currentVersion}.car"/>
+ <configuration name="geronimo/cars/welcome-tomcat-${pom.currentVersion}.car"/>
+ <configuration name="geronimo/cars/webconsole-tomcat-${pom.currentVersion}.car"/>
+ <configuration name="geronimo/cars/uddi-tomcat-${pom.currentVersion}.car"/>
</attributes>
Modified: geronimo/trunk/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/project.xml?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/project.xml (original)
+++ geronimo/trunk/configs/console-jetty/project.xml Wed Nov 16 18:05:56 2005
@@ -20,7 +20,6 @@
<project>
<pomVersion>3</pomVersion>
-<!-- <extend>../jetty-deployer/project.xml</extend>-->
<extend>../../etc/project.xml</extend>
<id>webconsole-jetty</id>
<name>Web console deployed on jetty</name>
Modified: geronimo/trunk/configs/console-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/src/plan/plan.xml?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/console-jetty/src/plan/plan.xml Wed Nov 16 18:05:56 2005
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2004-2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
+
<application
xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
Modified: geronimo/trunk/configs/console-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-tomcat/project.properties?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/project.properties (original)
+++ geronimo/trunk/configs/console-tomcat/project.properties Wed Nov 16 18:05:56 2005
@@ -21,5 +21,7 @@
maven.multiproject.type=car
-geronimo.packaging.moduleFile=${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_connector_version}.rar
+geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car,geronimo/cars/j2ee-deployer-${geronimo_version}.car,geronimo/cars/tomcat-deployer-${geronimo_version}.car
+
+geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/geronimo-console-${geronimo_version}.ear
Modified: geronimo/trunk/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-tomcat/project.xml?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/project.xml (original)
+++ geronimo/trunk/configs/console-tomcat/project.xml Wed Nov 16 18:05:56 2005
@@ -21,17 +21,71 @@
<project>
<pomVersion>3</pomVersion>
<extend>../../etc/project.xml</extend>
- <id>system-database</id>
- <name>System Database Configuration for the J2EE Server</name>
+ <id>webconsole-tomcat</id>
+ <name>Web console deployed on tomcat</name>
<dependencies>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>tomcat-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ </dependency>
+
<!-- parent config -->
<dependency>
<groupId>geronimo</groupId>
<artifactId>j2ee-server</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
</dependency>
+
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>${portlet_api_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>${pluto_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-console-core</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+ <!-- Keystore dependency -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-util</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
Modified: geronimo/trunk/configs/console-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-tomcat/src/plan/plan.xml?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/console-tomcat/src/plan/plan.xml Wed Nov 16 18:05:56 2005
@@ -18,61 +18,68 @@
<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
- configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
- parentId="${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car"
- >
- <resourceadapter>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>SystemDatasource</name>
- <config-property-setting name="UserName"></config-property-setting>
- <config-property-setting name="Password"></config-property-setting>
- <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
- <config-property-setting name="CreateDatabase">true</config-property-setting>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>100</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
+<application
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
+ configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+ >
- <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
- <reference name="ServerInfo"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
- <attribute name="derbySystemHome">var/derby</attribute>
- </gbean>
- <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
- <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
- <reference name="derbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
- <attribute name="host">localhost</attribute>
- <attribute name="port">1527</attribute>
- </gbean>
+ <module>
+ <web>geronimo-console-framework-${pom.currentVersion}.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0" configId="console">
+ <context-root>/console</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+ <security-realm-name>geronimo-properties-realm</security-realm-name>
+ <security>
+ <default-principal realm-name="geronimo-properties-realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
+ </default-principal>
+ <role-mappings>
+ <role role-name="admin">
+ <realm realm-name="geronimo-properties-realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" designated-run-as="true"/>
+ </realm>
+ </role>
+ </role-mappings>
+ </security>
+ </web-app>
+ </module>
+
+ <module>
+ <web>geronimo-console-standard-${pom.currentVersion}.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0" configId="console-standard">
+ <context-root>/console-standard</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+ </web-app>
+ </module>
- <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
- <attribute name="repeatCount">5</attribute>
- <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>TransactionContextManager</name></reference>
- <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
- <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>DefaultThreadPool</name></reference>
- <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
- <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
+ <!-- Console specific server info -->
+ <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
+ <reference name="ServerInfo">
+ <application>null</application>
+ <moduleType>J2EEModule</moduleType>
+ <module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module>
+ <name>ServerInfo</name>
+ </reference>
+ <reference name="LoginModule">
+ <application>null</application>
+ <moduleType>J2EEModule</moduleType>
+ <module>${pom.groupId}/cars/j2ee-security-${pom.currentVersion}.car</module>
+ <name>properties-login</name>
+ </reference>
</gbean>
- <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
- <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>TransactionContextManager</name></reference>
- <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
- <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>DefaultThreadPool</name></reference>
- <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
- <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
+ <!-- Keystore configuration -->
+ <gbean gbeanName="geronimo.security:type=KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean">
+ <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>
+ <attribute name="keyStoreType">jks</attribute>
+ <attribute name="keyStoreProvider">SUN</attribute>
+ <attribute name="keyStorePassword">password</attribute>
+ <reference name="serverInfo">
+ <application>null</application>
+ <moduleType>J2EEModule</moduleType>
+ <module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module>
+ <name>ServerInfo</name>
+ </reference>
</gbean>
-</connector>
+</application>
Modified: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Wed Nov 16 18:05:56 2005
@@ -61,8 +61,8 @@
<gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
<attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
<references name="ModuleBuilders">
- <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=geronimo/cars/jetty-deployer-1.0-SNAPSHOT.car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=JettyWebBuilder</gbean-name></pattern>
- <pattern><gbean-name>geronimo.maven:j2eeType=ModuleBuilder,name=TomcatWebBuilder,*</gbean-name></pattern>
+ <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/cars/jetty-deployer-${pom.currentVersion}.car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=JettyWebBuilder</gbean-name></pattern>
+ <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/cars/tomcat-deployer-${pom.currentVersion}.car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=TomcatWebBuilder</gbean-name></pattern>
</references>
</gbean>
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=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml Wed Nov 16 18:05:56 2005
@@ -33,11 +33,11 @@
</dependency>
<gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
- <attribute name="defaultParentId">org/apache/geronimo/Server,org/apache/geronimo/Tomcat</attribute>
+ <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car,${pom.groupId}/cars/tomcat-${pom.currentVersion}.car</attribute>
<attribute name="defaultContextPriorityClassloader">false</attribute>
<attribute name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
<reference name="WebServiceBuilder">
- <module>org/apache/geronimo/RuntimeDeployer</module>
+ <module>${pom.groupId}/cars/j2ee-deployer-${pom.currentVersion}.car</module>
<name>WebServiceBuilder</name>
</reference>
<reference name="Repository">
Modified: geronimo/trunk/configs/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat/project.xml?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/project.xml (original)
+++ geronimo/trunk/configs/tomcat/project.xml Wed Nov 16 18:05:56 2005
@@ -31,6 +31,9 @@
<artifactId>rmi-naming</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
Modified: geronimo/trunk/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat/src/plan/plan.xml?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat/src/plan/plan.xml Wed Nov 16 18:05:56 2005
@@ -24,7 +24,6 @@
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
- parentId="${pom.groupId}/cars/rmi-naming-${pom.currentVersion}.car"
>
<dependency>
@@ -34,6 +33,9 @@
<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>
@@ -105,7 +107,7 @@
<name>TomcatEngine</name>
</reference>
<reference name="ServerInfo">
- <module>org/apache/geronimo/System</module>
+ <module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module>
<name>ServerInfo</name>
</reference>
</gbean>
@@ -163,7 +165,7 @@
<name>TomcatWebContainer</name>
</reference>
<reference name="ServerInfo">
- <module>org/apache/geronimo/System</module>
+ <module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module>
<name>ServerInfo</name>
</reference>
</gbean>
@@ -190,7 +192,7 @@
<gbean name="TomcatAccessLogManager" class="org.apache.geronimo.tomcat.TomcatLogManagerImpl">
<reference name="ServerInfo">
- <module>org/apache/geronimo/System</module>
+ <module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module>
<name>ServerInfo</name>
</reference>
<references name="LogGBeans">
@@ -259,7 +261,5 @@
</reference>
-->
</gbean>
-
- <!-- TOMCAT CONFIGURATION ENDS HERE -->
</configuration>
Modified: geronimo/trunk/configs/uddi-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-tomcat/project.properties?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/project.properties (original)
+++ geronimo/trunk/configs/uddi-tomcat/project.properties Wed Nov 16 18:05:56 2005
@@ -21,5 +21,7 @@
maven.multiproject.type=car
-geronimo.packaging.moduleFile=${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_connector_version}.rar
+geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car,geronimo/cars/j2ee-deployer-${geronimo_version}.car,geronimo/cars/tomcat-deployer-${geronimo_version}.car
+
+geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-uddi-server-${geronimo_version}.war
Modified: geronimo/trunk/configs/uddi-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-tomcat/project.xml?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/project.xml (original)
+++ geronimo/trunk/configs/uddi-tomcat/project.xml Wed Nov 16 18:05:56 2005
@@ -21,17 +21,31 @@
<project>
<pomVersion>3</pomVersion>
<extend>../../etc/project.xml</extend>
- <id>system-database</id>
- <name>System Database Configuration for the J2EE Server</name>
+ <id>uddi-tomcat</id>
+ <name>UDDI server Configuration for the J2EE Tomcat Server</name>
<dependencies>
<!-- parent config -->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>j2ee-server</artifactId>
+ <artifactId>system-database</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
</dependency>
+
+ <dependency>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ <version>${juddi_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+<!-- should be transitive deps -->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
Modified: geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml Wed Nov 16 18:05:56 2005
@@ -18,61 +18,15 @@
<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
+<web-app
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
- parentId="${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car"
- >
- <resourceadapter>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>SystemDatasource</name>
- <config-property-setting name="UserName"></config-property-setting>
- <config-property-setting name="Password"></config-property-setting>
- <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
- <config-property-setting name="CreateDatabase">true</config-property-setting>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>100</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
+ >
- <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
- <reference name="ServerInfo"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
- <attribute name="derbySystemHome">var/derby</attribute>
- </gbean>
- <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
- <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
- <reference name="derbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
- <attribute name="host">localhost</attribute>
- <attribute name="port">1527</attribute>
- </gbean>
-
- <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
- <attribute name="repeatCount">5</attribute>
- <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>TransactionContextManager</name></reference>
- <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
- <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>DefaultThreadPool</name></reference>
- <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
- <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
- </gbean>
-
- <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
- <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>TransactionContextManager</name></reference>
- <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
- <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>DefaultThreadPool</name></reference>
- <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
- <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
- </gbean>
-
-</connector>
+ <context-root>/juddi</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+ <resource-ref>
+ <ref-name>jdbc/juddiDB</ref-name>
+ <resource-link>SystemDatasource</resource-link>
+ </resource-ref>
+</web-app>
Modified: geronimo/trunk/configs/welcome-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-jetty/project.xml?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/project.xml (original)
+++ geronimo/trunk/configs/welcome-jetty/project.xml Wed Nov 16 18:05:56 2005
@@ -31,10 +31,6 @@
<artifactId>j2ee-server</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
-<!-- <properties>
- <geronimo.import>true</geronimo.import>
- </properties>
--->
</dependency>
<dependency>
Modified: geronimo/trunk/configs/welcome-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-tomcat/project.properties?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/project.properties (original)
+++ geronimo/trunk/configs/welcome-tomcat/project.properties Wed Nov 16 18:05:56 2005
@@ -21,5 +21,7 @@
maven.multiproject.type=car
-geronimo.packaging.moduleFile=${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_connector_version}.rar
+geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car,geronimo/cars/j2ee-deployer-${geronimo_version}.car,geronimo/cars/tomcat-deployer-${geronimo_version}.car
+
+geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-welcome-${geronimo_version}.war
Modified: geronimo/trunk/configs/welcome-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-tomcat/project.xml?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/project.xml (original)
+++ geronimo/trunk/configs/welcome-tomcat/project.xml Wed Nov 16 18:05:56 2005
@@ -21,8 +21,8 @@
<project>
<pomVersion>3</pomVersion>
<extend>../../etc/project.xml</extend>
- <id>system-database</id>
- <name>System Database Configuration for the J2EE Server</name>
+ <id>welcome-tomcat</id>
+ <name>Welcome app Tomcat</name>
<dependencies>
<!-- parent config -->
@@ -32,6 +32,7 @@
<version>${geronimo_version}</version>
<type>car</type>
</dependency>
+
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
Modified: geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml?rev=345166&r1=345165&r2=345166&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml Wed Nov 16 18:05:56 2005
@@ -18,61 +18,10 @@
<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
- configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
- parentId="${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car"
- >
- <resourceadapter>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>SystemDatasource</name>
- <config-property-setting name="UserName"></config-property-setting>
- <config-property-setting name="Password"></config-property-setting>
- <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
- <config-property-setting name="CreateDatabase">true</config-property-setting>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>100</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
+ configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+ >
- <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
- <reference name="ServerInfo"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
- <attribute name="derbySystemHome">var/derby</attribute>
- </gbean>
- <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
- <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
- <reference name="derbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
- <attribute name="host">localhost</attribute>
- <attribute name="port">1527</attribute>
- </gbean>
-
- <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
- <attribute name="repeatCount">5</attribute>
- <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>TransactionContextManager</name></reference>
- <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
- <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>DefaultThreadPool</name></reference>
- <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
- <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
- </gbean>
-
- <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
- <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>TransactionContextManager</name></reference>
- <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
- <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>DefaultThreadPool</name></reference>
- <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
- <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
- </gbean>
-
-</connector>
+ <context-root>/</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+</web-app>