geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r170102 - in /geronimo/trunk/modules/assembly: maven.xml src/izpack/ src/izpack/geronimo-izpack.xml src/izpack/izpack-process.xml src/izpack/izpack-user-input.xml
Date Fri, 13 May 2005 22:18:57 GMT
Author: ammulder
Date: Fri May 13 15:18:55 2005
New Revision: 170102

URL: http://svn.apache.org/viewcvs?rev=170102&view=rev
Log:
Add the IzPack config files to the assembly module
Copy them over and substitute needed stuff on the way

Added:
    geronimo/trunk/modules/assembly/src/izpack/
    geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml   (with props)
    geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml   (with props)
    geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml   (with props)
Modified:
    geronimo/trunk/modules/assembly/maven.xml

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=170102&r1=170101&r2=170102&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Fri May 13 15:18:55 2005
@@ -195,7 +195,27 @@
             <fileset dir="${project.root}" includes="*.txt,STATUS"/>
         </ant:copy>
 
-        <!-- Preprocess all plans using velocity  -->
+        <!-- Preprocess all mungible content using velocity  -->
+
+        <!-- Copy over the IzPack Installer configuration files -->
+        <ant:mkdir dir="${basedir}/target/installer"/>
+        <fileScanner var="installFiles">
+            <fileset dir="${basedir}/src/izpack">
+                <include name="*.xml"/>
+            </fileset>
+        </fileScanner>
+        <j:set var="ServerClasspath" value="${server.classpath}" />
+        <j:set var="ClientClasspath" value="${client.classpath}" />
+        <j:set var="GeronimoVersion" value="${geronimo_version}" />
+        <j:set var="ReleaseNotesVersion" value="1.0-M3" />
+        <j:forEach var="installer" items="${installFiles.iterator()}">
+            <j:set var="installerName" value="${installer.name}"/>
+            <echo>Processing installer file ${installerName}</echo>
+            <velocity:merge
+                basedir="${basedir}/src/izpack"
+                template="${installerName}"
+                name="${basedir}/target/installer/${installerName}"/>
+        </j:forEach>
 
         <!-- First pass to write out plans with some variables remaining
              for the benefit of the installer -->

Added: geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml?rev=170102&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml (added)
+++ geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml Fri May 13 15:18:55 2005
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<installation version="1.0">
+    <info>
+        <appname>Apache Geronimo</appname>
+        <appversion>${GeronimoVersion}</appversion>
+        <url>http://geronimo.apache.org/</url>
+        <javaversion>1.4</javaversion>
+    </info>
+    <variables>
+      <variable name="SERVER_CLASSPATH" value="${ServerClasspath}" />
+      <variable name="CLIENT_CLASSPATH" value="${ClientClasspath}"/>
+    </variables>
+    <guiprefs width="640" height="480" resizable="yes"/>
+    <locale>
+        <langpack iso3="eng"/>
+    </locale>
+    <resources>
+        <res id="LicencePanel.licence" src="LICENSE.txt"/>
+        <res id="InfoPanel.info" src="RELEASE-NOTES-${ReleaseNotesVersion}.txt"/>
+        <res id="userInputSpec.xml" src="izpack-user-input.xml" />
+        <res id="ProcessPanel.Spec.xml" src="izpack-process.xml" />
+    </resources>
+    <panels>
+        <panel classname="HelloPanel"/>
+        <panel classname="LicencePanel"/>
+        <panel classname="TargetPanel"/>
+        <panel classname="PacksPanel"/>
+        <panel classname="UserInputPanel"/>
+        <panel classname="InstallPanel"/>
+        <panel classname="ProcessPanel"/>
+        <panel classname="InfoPanel"/>
+        <panel classname="FinishPanel"/>
+    </panels>
+    <packs>
+        <pack name="Server" required="yes">
+            <description>Core Geronimo installation</description>
+            <file src="BUILDING.txt" targetdir="$INSTALL_PATH"/>
+            <file src="LICENSE.txt" targetdir="$INSTALL_PATH"/>
+            <file src="NOTICE.txt" targetdir="$INSTALL_PATH"/>
+            <file src="PROPOSAL.txt" targetdir="$INSTALL_PATH"/>
+            <file src="README.txt" targetdir="$INSTALL_PATH"/>
+            <file src="RELEASE-NOTES-1.0-M1.txt" targetdir="$INSTALL_PATH"/>
+            <file src="RELEASE-NOTES-1.0-M2.txt" targetdir="$INSTALL_PATH"/>
+            <file src="RELEASE-NOTES-1.0-M3.txt" targetdir="$INSTALL_PATH"/>
+            <file src="STATUS" targetdir="$INSTALL_PATH"/>
+            <file src="bin" targetdir="$INSTALL_PATH"/>
+            <file src="lib" targetdir="$INSTALL_PATH"/>
+            <file src="config-store" targetdir="$INSTALL_PATH"/>
+            <file src="repository" targetdir="$INSTALL_PATH"/>
+            <file src="schema" targetdir="$INSTALL_PATH"/>
+            <file src="var" targetdir="$INSTALL_PATH"/>
+            <parsable targetfile="$INSTALL_PATH/var/security/users.properties" type="javaprop"/>
+            <parsable targetfile="$INSTALL_PATH/var/security/groups.properties" type="javaprop"/>
+            
+            <file src="plan-src/j2ee-deployer-plan.xml" targetdir="$INSTALL_PATH/server-plans"/>
+            <file src="plan-src/deployer-system-plan.xml" targetdir="$INSTALL_PATH/server-plans"/>
+            <file src="plan-src/system-plan.xml" targetdir="$INSTALL_PATH/server-plans"/>
+            <parsable targetfile="$INSTALL_PATH/server-plans/system-plan.xml" type="xml"/>
+        </pack>
+        <pack name="J2EE Features" required="yes">
+            <description>Geronimo J2EE Support</description>
+            <file src="plan-src/j2ee-server-plan.xml" targetdir="$INSTALL_PATH/server-plans"/>
+            <parsable targetfile="$INSTALL_PATH/server-plans/j2ee-server-plan.xml" type="xml"/>
+            <file src="plan-src/default-database-plan.xml" targetdir="$INSTALL_PATH/server-plans"/>
+            <file src="plan-src/system-activemq-plan.xml" targetdir="$INSTALL_PATH/server-plans"/>
+            <parsable targetfile="$INSTALL_PATH/server-plans/system-activemq-plan.xml"
type="xml"/>
+            <file src="plan-src/system-jms-plan.xml" targetdir="$INSTALL_PATH/server-plans"/>
+            <parsable targetfile="$INSTALL_PATH/server-plans/system-jms-plan.xml" type="xml"/>
+            <file src="plan-src/j2ee-secure-plan.xml" targetdir="$INSTALL_PATH/server-plans"/>
+            <file src="plan-src/client-system-plan.xml" targetdir="$INSTALL_PATH/server-plans"/>
+            <file src="plan-src/j2ee-client-plan.xml" targetdir="$INSTALL_PATH/server-plans"/>
+        </pack>
+        <pack name="JMX Console Web App" required="no">
+            <description>A web application that lets you display the JMX data from
a running Geronimo server.</description>
+            <file src="plan-src/geronimo-jmxdebug-${GeronimoVersion}.war" targetdir="$INSTALL_PATH/server-plans"/>
+        </pack>
+        <pack name="Demo Web Application" required="no">
+            <description>A sample web app that runs in Geronimo</description>
+            <file src="plan-src/geronimo-demo-${GeronimoVersion}.war" targetdir="$INSTALL_PATH/server-plans"/>
+        </pack>
+        <pack name="Sample Derby Database" required="no">
+            <description>A sample embedded database, using the Derby RDBMS</description>
+            <file src="plan-src/system-database-plan.xml" targetdir="$INSTALL_PATH/server-plans"/>
+            <parsable targetfile="$INSTALL_PATH/server-plans/system-database-plan.xml"
type="xml"/>
+        </pack>
+    </packs>
+</installation>
\ No newline at end of file

Propchange: geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml?rev=170102&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml (added)
+++ geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml Fri May 13 15:18:55 2005
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<processing>
+  <job name="Construct Server Executable">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>package</arg>
+      <arg>--classPath</arg>
+      <arg>$SERVER_CLASSPATH</arg>
+      <arg>--mainClass</arg>
+      <arg>org.apache.geronimo.system.main.Daemon</arg>
+      <arg>--install</arg>
+      <arg>$INSTALL_PATH/server-plans/system-plan.xml</arg>
+      <arg>$INSTALL_PATH/bin/server.jar</arg>
+    </executefile>
+    <executeForPack name="Server" />
+  </job>
+  <job name="Install Base J2EE Configuration">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/server-plans/j2ee-server-plan.xml</arg>
+    </executefile>
+    <executeForPack name="J2EE Features" />
+  </job>
+  <job name="Install Required Database Configuration">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/server-plans/default-database-plan.xml</arg>
+      <arg>$INSTALL_PATH/repository/tranql/rars/tranql-connector-1.0-M3.rar</arg>
+    </executefile>
+    <executeForPack name="J2EE Features" />
+  </job>
+  <job name="Install JMS Server Configuration">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/server-plans/system-activemq-plan.xml</arg>
+    </executefile>
+    <executeForPack name="J2EE Features" />
+  </job>
+  <job name="Install Required JMS Queue Configuration">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/server-plans/system-jms-plan.xml</arg>
+      <arg>$INSTALL_PATH/repository/activemq/rars/activemq-ra-1.2-20041105.rar</arg>
+    </executefile>
+    <executeForPack name="J2EE Features" />
+  </job>
+  <job name="Install Web Security Configuration">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/server-plans/j2ee-secure-plan.xml</arg>
+    </executefile>
+    <executeForPack name="J2EE Features" />
+  </job>
+  <job name="Construct Client Container Executable">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>package</arg>
+      <arg>--classPath</arg>
+      <arg>$CLIENT_CLASSPATH</arg>
+      <arg>--mainClass</arg>
+      <arg>org.apache.geronimo.system.main.ClientCommandLine</arg>
+      <arg>--install</arg>
+      <arg>$INSTALL_PATH/server-plans/client-system-plan.xml</arg>
+      <arg>$INSTALL_PATH/bin/client.jar</arg>
+    </executefile>
+    <executeForPack name="Server" />
+  </job>
+  <job name="Install Client Configuration">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/server-plans/j2ee-client-plan.xml</arg>
+    </executefile>
+    <executeForPack name="J2EE Features" />
+  </job>
+  <job name="Install JMX Console Web App Configuration">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/server-plans/geronimo-jmxdebug-1.0-M3.war</arg>
+    </executefile>
+    <executeForPack name="JMX Console Web App" />
+  </job>
+  <job name="Install Demo Web App Configuration">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/server-plans/geronimo-demo-1.0-M3.war</arg>
+    </executefile>
+    <executeForPack name="Demo Web Application" />
+  </job>
+  <job name="Install Sample Derby Database Configuration">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/server-plans/system-database-plan.xml</arg>
+      <arg>$INSTALL_PATH/repository/tranql/rars/tranql-connector-1.0-M3.rar</arg>
+    </executefile>
+    <executeForPack name="Sample Derby Database" />
+  </job>
+</processing>
\ No newline at end of file

Propchange: geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml?rev=170102&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml (added)
+++ geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml Fri May 13 15:18:55 2005
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<userInput>
+  <panel order="0">
+    <field type="title" txt="Basic Configuration" />
+    <field type="staticText" txt="Please select basic configuration options for Geronimo"/>
+    <divider />
+    <field type="text" variable="SecurityDefaultUser">
+      <description txt="User name used to manage and deploy to the Geronimo server" />
+      <spec txt="Username:" size="15" set="system" />
+      <createForPack name="Server" />
+    </field>
+    <field type="text" variable="SecurityDefaultPassword">
+      <description txt="Password used to manage and deploy to the Geronimo server" />
+      <spec txt="Password:" size="15" set="manager" />
+      <createForPack name="Server" />
+    </field>
+    <field type="text" variable="PlanServerHostname">
+      <description txt="Hostname the server should bind to when starting" />
+      <spec txt="Hostname:" size="50" set="localhost" />
+      <createForPack name="Server" />
+    </field>
+    <field type="text" variable="PlanClientAddresses">
+      <description txt="Client addresses the server should accept connections from" />
+      <spec txt="Clients:" size="50" set="127.0.0.1" />
+      <createForPack name="Server" />
+    </field>
+    <field type="rule" variable="PlanNamingPort">
+      <description txt="The network port that the Geronimo naming service should use"
/>
+      <spec txt="Naming Port:" layout="N:5:5" set="0:1099" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="Server" />
+    </field>
+    <field type="rule" variable="PlanJettyHTTPPort">
+      <description txt="The standard network port that the web container should use" />
+      <spec txt="HTTP Port:" layout="N:5:5" set="0:8080" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="J2EE Features" />
+    </field>
+    <field type="rule" variable="PlanJettyHTTPSPort">
+      <description txt="The secure network port that the web container should use" />
+      <spec txt="HTTPS Port:" layout="N:5:5" set="0:8443" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="J2EE Features" />
+    </field>
+    <field type="rule" variable="PlanOpenEJBPort">
+      <description txt="The network port that the EJB container should use" />
+      <spec txt="EJB Port:" layout="N:5:5" set="0:4201" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="J2EE Features" />
+    </field>
+  </panel>
+  <panel order="1">
+    <field type="title" txt="Service Configuration" />
+    <field type="staticText" txt="Please configure any supplementary services"/>
+    <divider />
+    <field type="rule" variable="PlanActiveMQPort">
+      <description txt="The network port that the ActiveMQ JMS server should use" />
+      <spec txt="JMS Port:" layout="N:5:5" set="0:61616" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="J2EE Features" />
+    </field>
+    <field type="rule" variable="PlanDerbyPort">
+      <description txt="The network port that the Derby DB should use" />
+      <spec txt="Derby Port:" layout="N:5:5" set="0:1527" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="Sample Derby Database" />
+    </field>
+    <field type="rule" variable="PlanIIOPPort">
+      <description txt="The network port that the RMI/IIOP listener should use" />
+      <spec txt="IIOP Port:" layout="N:5:5" set="0:9000" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="J2EE Features" />
+    </field>
+    <field type="rule" variable="PlanORBPort">
+      <description txt="The network port that the IIOP ORB should use" />
+      <spec txt="ORB Port:" layout="N:5:5" set="0:2001" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="J2EE Features" />
+    </field>
+    <field type="rule" variable="PlanCOSNamingPort">
+      <description txt="The network port that the CORBA Naming Service should use" />
+      <spec txt="CosNaming Port:" layout="N:5:5" set="0:1050" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="J2EE Features" />
+    </field>
+    <field type="rule" variable="PlanTomcatHTTPPort">
+      <description txt="The standard network port that Tomcat should use" />
+      <spec txt="Tomcat Port:" layout="N:5:5" set="0:8090" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="J2EE Features" />
+    </field>
+    <field type="rule" variable="PlanTomcatHTTPSPort">
+      <description txt="The secure network port that Tomcat should use" />
+      <spec txt="Tomcat Secure Port:" layout="N:5:5" set="0:8453" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="J2EE Features" />
+    </field>
+    <field type="rule" variable="PlanTomcatAJPPort">
+      <description txt="The network port that the Tomcat/Apache connector should use"
/>
+      <spec txt="Tomcat Apache Port:" layout="N:5:5" set="0:8009" />
+      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
+      <createForPack name="J2EE Features" />
+    </field>
+  </panel>
+</userInput>
\ No newline at end of file

Propchange: geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message