geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r169930 - in /geronimo/trunk/modules/assembly: ./ src/plan/
Date Fri, 13 May 2005 03:18:40 GMT
Author: ammulder
Date: Thu May 12 20:18:40 2005
New Revision: 169930

URL: http://svn.apache.org/viewcvs?rev=169930&view=rev
Log:
Start automating the process of creating an installer package of Geronimo
 - make all the host names, ports, etc. variables instead of constants
 - create two copies of the plans, one with default values substituted
   in (as before), and one leaving the above variables in place so the
   installer can prompt for them
 - create a copy of the Geronimo tree after the deploy tool has been
   bootstrapped but before any of the other configurations have been
   deployed (this plus the modified plans is what the installer will
   start with)

Modified:
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
    geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml
    geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
    geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
    geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml
    geronimo/trunk/modules/assembly/src/plan/system-plan.xml

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=169930&r1=169929&r2=169930&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Thu May 12 20:18:40 2005
@@ -196,7 +196,10 @@
         </ant:copy>
 
         <!-- Preprocess all plans using velocity  -->
-        <ant:mkdir dir="${basedir}/target/plan"/>
+
+        <!-- First pass to write out plans with some variables remaining
+             for the benefit of the installer -->
+        <ant:mkdir dir="${basedir}/target/installer/plan-src"/>
         <fileScanner var="plans">
             <fileset dir="${basedir}/src/plan">
                 <include name="*-plan.xml"/>
@@ -205,6 +208,35 @@
 
         <j:forEach var="plan" items="${plans.iterator()}">
             <j:set var="planName" value="${plan.name}"/>
+            <echo>Installer processing ${planName}</echo>
+            <velocity:merge
+                basedir="${basedir}/src/plan"
+                template="${planName}"
+                name="${basedir}/target/installer/plan-src/${planName}"/>
+        </j:forEach>
+
+
+        <!-- Second pass for the default build -->
+
+        <!-- Substitution variables for default hostname, ports, etc. -->
+        <j:set var="PlanServerHostname" value="localhost" />
+        <j:set var="PlanNamingPort" value="1099" />
+        <j:set var="PlanIIOPPort" value="9000" />
+        <j:set var="PlanORBPort" value="2001" />
+        <j:set var="PlanCOSNamingPort" value="1050" />
+        <j:set var="PlanClientAddresses" value="127.0.0.1" />
+        <j:set var="PlanJettyHTTPPort" value="8080" />
+        <j:set var="PlanJettyHTTPSPort" value="8443" />
+        <j:set var="PlanOpenEJBPort" value="4201" />
+        <j:set var="PlanTomcatHTTPPort" value="8090" />
+        <j:set var="PlanTomcatHTTPSPort" value="8443" />
+        <j:set var="PlanTomcatAJPPort" value="8009" />
+        <j:set var="PlanActiveMQPort" value="61616" />
+        <j:set var="PlanDerbyPort" value="1527" />
+
+        <ant:mkdir dir="${basedir}/target/plan"/>
+        <j:forEach var="plan" items="${plans.iterator()}">
+            <j:set var="planName" value="${plan.name}"/>
             <echo>Preprocessing ${planName}</echo>
             <velocity:merge
                 basedir="${basedir}/src/plan"
@@ -234,6 +266,10 @@
             deployerGBean="geronimo.deployer:name=Deployer,J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,j2eeType=Deployer,J2EEServer=deployer"
             deploymentFactory="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl"
             />
+
+        <ant:copy todir="${basedir}/target/installer">
+          <ant:fileset dir="${distDir}" />
+        </ant:copy>
 
         <!-- build the system configuration and server.jar -->
         <ant:echo>Building server.jar</ant:echo>

Modified: geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml?rev=169930&r1=169929&r2=169930&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml Thu May 12 20:18:40 2005
@@ -67,7 +67,7 @@
     <gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
         <attribute name="namingFactoryInitial">com.sun.jndi.rmi.registry.RegistryContextFactory</attribute>
         <attribute name="namingFactoryUrlPkgs">org.apache.geronimo.naming</attribute>
-        <attribute name="namingProviderUrl">rmi://localhost:1099</attribute>
+        <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
     </gbean>
 
 </configuration>

Modified: geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml?rev=169930&r1=169929&r2=169930&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml Thu May 12 20:18:40 2005
@@ -55,9 +55,9 @@
 
     <gbean gbeanName="interop:type=NetworkService,name=RMIIIOP" class="org.openejb.server.StandardServiceStackGBean">
         <attribute name="name">RMIIIOP</attribute>
-        <attribute name="port">9000</attribute>
-        <attribute name="address">127.0.0.1</attribute>
-        <attribute name="allowHosts">127.0.0.1</attribute>
+        <attribute name="port">${PlanIIOPPort}</attribute>
+        <attribute name="address">${PlanServerHostname}</attribute>
+        <attribute name="allowHosts">${PlanClientAddresses}</attribute>
         <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
         <attribute name="logOnFailure">HOST,NAME</attribute>
         <reference name="Executor"><name>DefaultThreadPool</name></reference>
@@ -68,7 +68,7 @@
         <reference name="adapterManager"><gbean-name>interop:name=AdapterManager</gbean-name></reference>
         <attribute name="writeSystemExceptionStackTrace">false</attribute>
         <attribute name="simpleIDL">false</attribute>
-        <attribute name="args">-ORBPort, 2001, -ORBInitRef, NameService=corbaloc::localhost:1050/NameService,
-ORBCSIv2, -ORBGSSClientUser, "user1,a"</attribute>
+        <attribute name="args">-ORBPort, ${PlanORBPort}, -ORBInitRef, NameService=corbaloc::${PlanServerHostname}:${PlanCOSNamingPort}/NameService,
-ORBCSIv2, -ORBGSSClientUser, "user1,a"</attribute>
         <attribute name="props">
 
             org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.transaction.TransactionInitializer

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?rev=169930&r1=169929&r2=169930&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Thu May 12 20:18:40 2005
@@ -234,14 +234,14 @@
     </gbean>
 
     <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty.connector.HTTPConnector">
-        <attribute name="port">8080</attribute>
+        <attribute name="port">${PlanJettyHTTPPort}</attribute>
         <reference name="JettyContainer"><name>JettyWebContainer</name></reference>
         <!--        <attribute name="MaxConnections">10</attribute>-->
         <!--        <attribute name="MaxIdleTime">10</attribute>-->
     </gbean>
 
     <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty.connector.HTTPSConnector">
-        <attribute name="port">8443</attribute>
+        <attribute name="port">${PlanJettyHTTPSPort}</attribute>
         <attribute name="keystore">var/security/keystore</attribute>
         <attribute name="keystoreType">JKS</attribute>
         <attribute name="password">secret</attribute>
@@ -255,9 +255,9 @@
     <!-- EJB Protocol -->
     <gbean gbeanName="openejb:type=NetworkService,name=EJB" class="org.openejb.server.StandardServiceStackGBean">
         <attribute name="name">EJB</attribute>
-        <attribute name="port">4201</attribute>
-        <attribute name="address">127.0.0.1</attribute>
-        <attribute name="allowHosts">127.0.0.1</attribute>
+        <attribute name="port">${PlanOpenEJBPort}</attribute>
+        <attribute name="address">${PlanServerHostname}</attribute>
+        <attribute name="allowHosts">${PlanClientAddresses}</attribute>
         <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
         <attribute name="logOnFailure">HOST,NAME</attribute>
         <reference name="Executor"><name>DefaultThreadPool</name></reference>
@@ -288,7 +288,7 @@
 
     <!-- JMX Remoting -->
     <gbean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector">
-        <attribute name="url">service:jmx:rmi://localhost/jndi/rmi:/JMXConnector</attribute>
+        <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
         <attribute name="applicationConfigName">JMX</attribute>
     </gbean>
 

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml?rev=169930&r1=169929&r2=169930&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml Thu May 12 20:18:40
2005
@@ -133,13 +133,13 @@
 
     <gbean name="TomcatWebConnector" class="org.apache.geronimo.tomcat.ConnectorGBean">
         <attribute name="initParams">
-            port=8090
+            port=${PlanTomcatHTTPPort}
             maxHttpHeaderSize=8192
             maxThreads=150
             minSpareThreads=25
             maxSpareThreads=75
             enableLookups=false
-            redirectPort=8443
+            redirectPort=${PlanTomcatHTTPSPort}
             acceptCount=100
             connectionTimeout=20000
             disableUploadTimeout=true
@@ -152,9 +152,9 @@
     <gbean name="TomcatAJPConnector" class="org.apache.geronimo.tomcat.ConnectorGBean">
         <attribute name="protocol">AJP/1.3</attribute>
         <attribute name="initParams">
-            port=8009
+            port=${PlanTomcatAJPPort}
             enableLookups=false
-            redirectPort=8443
+            redirectPort=${PlanTomcatHTTPSPort}
         </attribute>
         <reference name="TomcatContainer">
             <name>TomcatWebContainer</name>
@@ -172,7 +172,7 @@
 
     <gbean name="TomcatWebSSLConnector" class="org.apache.geronimo.tomcat.ConnectorGBean">
         <attribute name="initParams">
-            port=8443
+            port=${PlanTomcatHTTPSPort}
             maxHttpHeaderSize=8192
             maxThreads=150
             minSpareThreads=25
@@ -194,7 +194,7 @@
         <attribute name="className">org.apache.geronimo.tomcat.TomcatEngine</attribute>
         <attribute name="initParams">
             name=Geronimo
-            defaultHost=localhost
+            defaultHost=${PlanServerHostname}
         </attribute>
         <reference name="realmGBean">
             <name>TomcatJAASRealm</name>
@@ -218,7 +218,7 @@
     <gbean name="SecondValve" class="org.apache.geronimo.tomcat.ValveGBean">
         <attribute name="className">org.apache.catalina.valves.AccessLogValve</attribute>
         <attribute name="initParams">
-            prefix=localhost_access_log.
+            prefix=${PlanServerHostname}_access_log.
             suffix=.txt
             pattern=common
         </attribute>
@@ -239,7 +239,7 @@
     <gbean name="TomcatHost" class="org.apache.geronimo.tomcat.HostGBean">
         <attribute name="className">org.apache.catalina.core.StandardHost</attribute>
         <attribute name="initParams">
-            name=localhost
+            name=${PlanServerHostname}
             appBase=
             workDir=work
         </attribute>

Modified: geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml?rev=169930&r1=169929&r2=169930&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml Thu May 12 20:18:40
2005
@@ -56,8 +56,8 @@
         <reference name="dataSource"><gbean-name>geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemDatabase,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</gbean-name></reference>
     </gbean>
 
-    <gbean name="ActiveMQ.tcp.localhost.61616" class="org.activemq.gbean.ActiveMQConnectorGBean">
-        <attribute name="url">tcp://localhost:61616</attribute>
+    <gbean name="ActiveMQ.tcp.${PlanServerHostname}.${PlanActiveMQPort}" class="org.activemq.gbean.ActiveMQConnectorGBean">
+        <attribute name="url">tcp://${PlanServerHostname}:${PlanActiveMQPort}</attribute>
         <reference name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
     </gbean>
 

Modified: geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml?rev=169930&r1=169929&r2=169930&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml Thu May 12 20:18:40
2005
@@ -64,8 +64,8 @@
     <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">127.0.0.1</attribute>
-        <attribute name="port">1527</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanDerbyPort}</attribute>
     </gbean>
 
     <gbean name="JDBCTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">

Modified: geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml?rev=169930&r1=169929&r2=169930&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml Thu May 12 20:18:40 2005
@@ -25,7 +25,7 @@
     <resourceadapter>
         <resourceadapter-instance>
             <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
-            <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
+            <config-property-setting name="ServerUrl">tcp://${PlanServerHostname}:${PlanActiveMQPort}</config-property-setting>
             <config-property-setting name="UserName">geronimo</config-property-setting>
             <config-property-setting name="Password">geronimo</config-property-setting>
             <workmanager>

Modified: geronimo/trunk/modules/assembly/src/plan/system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-plan.xml?rev=169930&r1=169929&r2=169930&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-plan.xml Thu May 12 20:18:40 2005
@@ -71,13 +71,13 @@
 
     <!-- RMI Registry -->
     <gbean name="RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService">
-        <attribute name="port">1099</attribute>
+        <attribute name="port">${PlanNamingPort}</attribute>
     </gbean>
 
     <!-- Naming properties -->
     <gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
         <attribute name="namingFactoryInitial">com.sun.jndi.rmi.registry.RegistryContextFactory</attribute>
         <attribute name="namingFactoryUrlPkgs">org.apache.geronimo.naming</attribute>
-        <attribute name="namingProviderUrl">rmi://localhost:1099</attribute>
+        <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
     </gbean>
 </configuration>



Mime
View raw message