You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/19 07:32:49 UTC
svn commit: r423375 - in
/geronimo/sandbox/svkmerge/m2migration/m2-assemblies: geronimo-jetty-j2ee/
geronimo-jetty-j2ee/src/main/var/config/ geronimo-tomcat-j2ee/
geronimo-tomcat-j2ee/src/main/var/config/
Author: jdillon
Date: Tue Jul 18 22:32:49 2006
New Revision: 423375
URL: http://svn.apache.org/viewvc?rev=423375&view=rev
Log:
Keep tomcat assembly in sync with jetty (or try to)
Update offline-deployer-list to use correct groupId and filter to add version
Modified:
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/offline-deployer-list
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/offline-deployer-list
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml?rev=423375&r1=423374&r2=423375&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml Tue Jul 18 22:32:49 2006
@@ -606,6 +606,7 @@
<directory>${pom.basedir}/src/main/var/config</directory>
<includes>
<include>config.xml</include>
+ <include>offline-deployer-list</include>
</includes>
<filtering>true</filtering>
</resource>
@@ -756,9 +757,13 @@
<mapper type="flatten"/>
</copy>
- <!-- Filter the config.xml -->
- <move file="${project.build.directory}/classes/config.xml"
- tofile="${project.build.directory}/scratch/config.xml"/>
+ <!-- Move filtered files -->
+ <move todir="${project.build.directory}/scratch">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="config.xml"/>
+ <include name="offline-deployer-list"/>
+ </fileset>
+ </move>
</tasks>
</configuration>
</execution>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/offline-deployer-list
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/offline-deployer-list?rev=423375&r1=423374&r2=423375&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/offline-deployer-list (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/offline-deployer-list Tue Jul 18 22:32:49 2006
@@ -1,7 +1,9 @@
-#list of deployers to be started for offline deployment
-geronimo/geronimo-gbean-deployer//car
-geronimo/j2ee-deployer//car
-geronimo/openejb-deployer//car
-geronimo/client-deployer//car
-geronimo/axis-deployer//car
-geronimo/jetty-deployer//car
+##
+## List of deployers to be started for offline deployment
+##
+org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car
+org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car
+org.apache.geronimo.configs/openejb-deployer/${pom.version}/car
+org.apache.geronimo.configs/client-deployer/${pom.version}/car
+org.apache.geronimo.configs/axis-deployer/${pom.version}/car
+org.apache.geronimo.configs/jetty-deployer/${pom.version}/car
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml?rev=423375&r1=423374&r2=423375&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml Tue Jul 18 22:32:49 2006
@@ -121,7 +121,6 @@
<type>car</type>
</dependency>
- <!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>activemq-broker</artifactId>
@@ -135,7 +134,6 @@
<version>${pom.version}</version>
<type>car</type>
</dependency>
- -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -269,14 +267,12 @@
</dependency>
-->
- <!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>remote-deploy-tomcat</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
- -->
<!--
<dependency>
@@ -612,6 +608,7 @@
<directory>${pom.basedir}/src/main/var/config</directory>
<includes>
<include>config.xml</include>
+ <include>offline-deployer-list</include>
</includes>
<filtering>true</filtering>
</resource>
@@ -762,9 +759,13 @@
<mapper type="flatten"/>
</copy>
- <!-- Filter the config.xml -->
- <move file="${project.build.directory}/classes/config.xml"
- tofile="${project.build.directory}/scratch/config.xml"/>
+ <!-- Move filtered files -->
+ <move todir="${project.build.directory}/scratch">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="config.xml"/>
+ <include name="offline-deployer-list"/>
+ </fileset>
+ </move>
</tasks>
</configuration>
</execution>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml?rev=423375&r1=423374&r2=423375&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml Tue Jul 18 22:32:49 2006
@@ -7,6 +7,7 @@
<!-- ======================================================== -->
<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+
<module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
<gbean name="RMIRegistry">
<attribute name="port">${PlanNamingPort}</attribute>
@@ -20,8 +21,10 @@
<attribute name="userRepositories">[]</attribute>
</gbean>
</module>
+
<module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car">
</module>
+
<module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
<gbean name="JaasLoginServiceRemotingServer">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -34,13 +37,16 @@
<attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
</gbean>
</module>
+
<module name="org.apache.geronimo.configs/axis/${pom.version}/car"/>
+
<module name="org.apache.geronimo.configs/openejb/${pom.version}/car">
<gbean name="EJBNetworkService">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanOpenEJBPort}</attribute>
</gbean>
</module>
+
<module name="org.apache.geronimo.configs/j2ee-corba/${pom.version}/car" load="false">
<gbean name="NameServer">
<attribute name="dbDir">var/cosnaming.db</attribute>
@@ -53,19 +59,23 @@
<attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
</gbean>
</module>
+
<module name="org.apache.geronimo.configs/system-database/${pom.version}/car">
<gbean name="DerbyNetwork">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanDerbyPort}</attribute>
</gbean>
</module>
- <!-- module name="org.apache.geronimo.configs/activemq-broker/${pom.version}/car">
+
+ <module name="org.apache.geronimo.configs/activemq-broker/${pom.version}/car">
<gbean name="ActiveMQ.tcp.default">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanActiveMQPort}</attribute>
</gbean>
- </module -->
- <!-- module name="org.apache.geronimo.configs/activemq/${pom.version}/car"/ -->
+ </module>
+
+ <module name="org.apache.geronimo.configs/activemq/${pom.version}/car"/>
+
<module name="org.apache.geronimo.configs/tomcat/${pom.version}/car">
<gbean name="TomcatEngine">
<reference name="TomcatValveChain" />
@@ -73,7 +83,7 @@
<!-- To disable accesslogging uncomment the following line
<gbean name="FirstValve" load="false"></gbean>
-->
-
+
<gbean name="TomcatResources"/>
<gbean name="TomcatWebConnector">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -90,21 +100,30 @@
<attribute name="port">${PlanHTTPSPortPrimary}</attribute>
</gbean>
</module>
- <!-- n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer so that defaultEnvironment
- overrides work properly -->
+
+ <!--
+
+ NOTE: n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer
+ so that defaultEnvironment overrides work properly
+ -->
<module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
+
<module name="org.apache.geronimo.configs/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="org.apache.geronimo.configs/openejb-deployer/${pom.version}/car">
<gbean name="EJBBuilder">
<attribute name="listener">?name=TomcatWebContainer</attribute>
</gbean>
</module>
+
<module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car"/>
+
<module name="org.apache.geronimo.configs/axis-deployer/${pom.version}/car"/>
+
<module name="org.apache.geronimo.configs/javamail/${pom.version}/car" load="false">
<gbean name="SMTPTransport">
<attribute name="host">localhost</attribute>
@@ -112,21 +131,27 @@
</gbean>
</module>
- <!-- module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
+ <module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
<gbean name="SharedLib">
<attribute name="classesDirs">var/shared/classes</attribute>
<attribute name="libDirs">var/shared/lib</attribute>
</gbean>
- </module -->
-
+ </module>
+
<module name="org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car"/>
<module name="org.apache.geronimo.configs/welcome-tomcat/${pom.version}/car"/>
<!--
<module name="org.apache.geronimo.configs/webconsole-tomcat/${pom.version}/car"/>
+
<module name="org.apache.geronimo.configs/uddi-tomcat/${pom.version}/car" load="false"/>
+ -->
+
<module name="org.apache.geronimo.configs/remote-deploy-tomcat/${pom.version}/car" />
+
+ <!--
<module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
-->
+
</attributes>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/offline-deployer-list
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/offline-deployer-list?rev=423375&r1=423374&r2=423375&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/offline-deployer-list (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/offline-deployer-list Tue Jul 18 22:32:49 2006
@@ -1,7 +1,9 @@
-#list of deployers to be started for offline deployment
-geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car
-geronimo/j2ee-deployer/${pom.currentVersion}/car
-geronimo/openejb-deployer/${pom.currentVersion}/car
-geronimo/client-deployer/${pom.currentVersion}/car
-geronimo/axis-deployer/${pom.currentVersion}/car
-geronimo/tomcat-deployer/${pom.currentVersion}/car
+##
+## List of deployers to be started for offline deployment
+##
+org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car
+org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car
+org.apache.geronimo.configs/openejb-deployer/${pom.version}/car
+org.apache.geronimo.configs/client-deployer/${pom.version}/car
+org.apache.geronimo.configs/axis-deployer/${pom.version}/car
+org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car