geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r292868 - in /geronimo/branches/1.0-M5/modules/assembly: ./ src/izpack/ src/var/config/
Date Fri, 30 Sep 2005 22:32:22 GMT
Author: djencks
Date: Fri Sep 30 15:32:12 2005
New Revision: 292868

URL: http://svn.apache.org/viewcvs?rev=292868&view=rev
Log:
Resurrect the installer

Added:
    geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.izpack.list
Modified:
    geronimo/branches/1.0-M5/modules/assembly/maven.xml
    geronimo/branches/1.0-M5/modules/assembly/src/izpack/geronimo-izpack.xml
    geronimo/branches/1.0-M5/modules/assembly/src/izpack/izpack-process.xml
    geronimo/branches/1.0-M5/modules/assembly/src/izpack/izpack-user-input.xml
    geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.jetty.xml
    geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.list
    geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.tomcat.xml
    geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.xml

Modified: geronimo/branches/1.0-M5/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/assembly/maven.xml?rev=292868&r1=292867&r2=292868&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/assembly/maven.xml (original)
+++ geronimo/branches/1.0-M5/modules/assembly/maven.xml Fri Sep 30 15:32:12 2005
@@ -233,31 +233,7 @@
         <!-- Preprocess all mungible content using velocity -->
         <!-- ============================================== -->
 
-        <!-- Copy over the IzPack Installer 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-M4"/>
-        <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>
-
-        <!-- Write out a copy of config.xml with substitution variables intact -->
-        <velocity:merge basedir="${basedir}/src/var/config"
-            template="config.xml"
-            name="${basedir}/target/installer/config.xml"/>
-
+        <attainGoal name="assembly:izpack-prepare"/>
         <!-- Substitution variables for default hostname, ports, etc. -->
         <j:set var="PlanServerHostname" value="0.0.0.0"/>
         <j:set var="PlanNamingPort" value="1099"/>
@@ -498,10 +474,38 @@
         </ant:copy>
         <ant:echo file="${basedir}/target/installer/var/security/users.properties" message="$${SecurityDefaultUser}=$${SecurityDefaultPassword}"/>
         <ant:echo file="${basedir}/target/installer/var/security/groups.properties" message="admin=$${SecurityDefaultUser}"/>
-        <ant:echo file="${basedir}/target/installer/var/config/config.list" message="org/apache/geronimo/System"/>
+<!--        <ant:echo file="${basedir}/target/installer/var/config/config.list" message="org/apache/geronimo/System"/>-->
 
         <ant:move file="${basedir}/target/installer/config.xml"
             tofile="${basedir}/target/installer/var/config/config.xml"/>
+    </goal>
+
+    <goal name="assembly:izpack-prepare">
+        <!-- this is not complete: after assembly we copy everything into the installer dir -->
+        <!-- TODO use the zip file instead of copying -->
+        <!-- Copy over the IzPack Installer files -->
+        <ant:mkdir dir="${basedir}/target/installer"/>
+        <fileScanner var="installFiles">
+            <fileset dir="${basedir}/src/izpack">
+                <include name="*.xml"/>
+            </fileset>
+        </fileScanner>
+        <j:set var="GeronimoVersion" value="${geronimo_version}"/>
+        <j:set var="ReleaseNotesVersion" value="1.0-M5"/>
+        <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>
+
+        <!-- Write out a copy of config.xml with substitution variables intact -->
+        <velocity:merge basedir="${basedir}/src/var/config"
+            template="config.xml"
+            name="${basedir}/target/installer/config.xml"/>
+
     </goal>
 
     <goal name="online.deploy">

Modified: geronimo/branches/1.0-M5/modules/assembly/src/izpack/geronimo-izpack.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/assembly/src/izpack/geronimo-izpack.xml?rev=292868&r1=292867&r2=292868&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/assembly/src/izpack/geronimo-izpack.xml (original)
+++ geronimo/branches/1.0-M5/modules/assembly/src/izpack/geronimo-izpack.xml Fri Sep 30 15:32:12 2005
@@ -7,8 +7,6 @@
         <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>
@@ -29,6 +27,10 @@
         <panel classname="UserInputPanel"/>
         <panel classname="UserInputPanel"/>
         <panel classname="UserInputPanel"/>
+        <panel classname="UserInputPanel"/>
+        <panel classname="UserInputPanel"/>
+        <panel classname="UserInputPanel"/>
+        <panel classname="UserInputPanel"/>
         <panel classname="InstallPanel"/>
         <panel classname="ProcessPanel"/>
         <panel classname="InfoPanel"/>
@@ -51,6 +53,7 @@
             <file src="repository" targetdir="$INSTALL_PATH"/>
             <file src="schema" targetdir="$INSTALL_PATH"/>
             <file src="var" targetdir="$INSTALL_PATH"/>
+            <singlefile src="var/config/config.izpack.list" target="$INSTALL_PATH/var/config/config.list"/>
             <parsable targetfile="$INSTALL_PATH/var/security/users.properties" type="javaprop"/>
             <parsable targetfile="$INSTALL_PATH/var/security/groups.properties" type="javaprop"/>
             <parsable targetfile="$INSTALL_PATH/var/config/config.xml" type="xml"/>
@@ -60,16 +63,69 @@
             <!-- o/o/g/Server -->
             <!-- o/o/g/RuntimeDeployer -->
             <!-- o/o/g/SystemDatabase -->
-            <!-- o/o/g/ActiveMQServer -->
-            <!-- o/o/g/SystemJMS -->
             <description>If selected, basic features for J2EE support will be enabled, including a J2EE Web container, a JMS broker, an EJB server, an embedded Derby database, an administrative security realm, etc.  If not selected, these features will be installed but would need to be manually activated later.</description>
             <depends packname="Server" />
         </pack>
-        <pack name="Web Management Console" required="no" preselected="yes">
-            <!-- o/o/g/Console -->
-            <description>A web-based management console which allows an administrator to log in and view and customize the Geronimo server configuration (such as network ports, logging, thread pools, application deployments, etc.).  The console login is the same administrative login you'll be setting in the next step.  The console can typically be reached at http://localhost:8080/console/ though the default port may be changed on the web configuration screen.  If not selected, the console will be installed but would need to be manually activated later.</description>
+
+        <pack name="CORBA Features" required="no" preselected="yes">
+            <!-- o/o/g/ServerCORBA -->
+            <description>Basic ORB and Name Server support with many sample target security configurations</description>
+            <depends packname="J2EE Features" />
+        </pack>
+
+        <pack name="JMS Features" required="no" preselected="yes">
+            <!-- o/o/g/ActiveMQServer -->
+            <!-- o/o/g/SystemJMS -->
+            <description>The ActiveMQ broker and a sample J2CA 1.5 connector deployment</description>
             <depends packname="J2EE Features" />
         </pack>
+
+        <!-- JETTY -->
+        <pack name="Jetty Web Container" required="no" preselected="yes">
+            <!-- o/o/g/Jetty -->
+            <!-- o/o/g/JettyRuntimeDeployer -->
+            <description>The Jetty Web Container</description>
+            <depends packname="J2EE Features" />
+        </pack>
+        <pack name="Jetty Welcome Application" required="no" preselected="yes">
+            <!-- o/o/g/Console/Jetty -->
+            <description>Simple welcome application normally at localhost:8080/</description>
+            <depends packname="Jetty Web Container" />
+        </pack>
+        <pack name="Jetty Web Management Console" required="no" preselected="yes">
+            <!-- o/o/g/Console/Jetty -->
+            <description>A web-based management console which allows an administrator to log in and view and customize the Geronimo server configuration (such as network ports, logging, thread pools, application deployments, etc.).  The console login is the same administrative login you'll be setting in the next step.  The console can typically be reached at http://localhost:8080/console/ though the default port may be changed on the web configuration screen.  If not selected, the console will be installed but would need to be manually activated later.</description>
+            <depends packname="Jetty Web Container" />
+        </pack>
+        <pack name="Jetty UDDI Server" required="no" preselected="no">
+            <!-- o/o/g/juddiServer/1.0/Jetty -->
+            <description>A UDDI server that runs in Geronimo, using the jUDDI package.</description>
+            <depends packname="Jetty Web Container" />
+        </pack>
+
+        <!-- TOMCAT-->
+        <pack name="Tomcat Web Container" required="no" preselected="yes">
+            <!-- o/o/g/Tomcat -->
+            <!-- o/o/g/TomcatRuntimeDeployer -->
+            <description>The Tomcat Web Container</description>
+            <depends packname="J2EE Features" />
+        </pack>
+        <pack name="Tomcat Welcome Application" required="no" preselected="yes">
+             <!-- o/o/g/Console/Tomcat -->
+            <description>Simple welcome application normally at localhost:8080/</description>
+             <depends packname="Tomcat Web Container" />
+         </pack>
+         <pack name="Tomcat Web Management Console" required="no" preselected="yes">
+             <!-- o/o/g/Console/Tomcat -->
+             <description>A web-based management console which allows an administrator to log in and view and customize the Geronimo server configuration (such as network ports, logging, thread pools, application deployments, etc.).  The console login is the same administrative login you'll be setting in the next step.  The console can typically be reached at http://localhost:8080/console/ though the default port may be changed on the web configuration screen.  If not selected, the console will be installed but would need to be manually activated later.</description>
+             <depends packname="Tomcat Web Container" />
+         </pack>
+         <pack name="Tomcat UDDI Server" required="no" preselected="no">
+             <!-- o/o/g/juddiServer/1.0/Tomcat -->
+             <description>A UDDI server that runs in Geronimo, using the jUDDI package.</description>
+             <depends packname="Tomcat Web Container" />
+         </pack>
+
         <pack name="LDAP Server" required="no" preselected="no">
             <!-- o/o/g/Directory -->
             <description>An LDAP directory server that runs in Geronimo, using the Apache Directory package.  This runs on the non-standard port of 1389 by default, so the server can start as a non-root user.  If not selected, this configuration will be available but would need to be manually activated later.</description>
@@ -80,11 +136,6 @@
             <description>A sample embedded database, using the Derby RDBMS.  If selected, this creates a database pool that connects to the "DefaultDatabase" database running in the embedded Derby installation.  If not selected, this configuration will be available but would need to be manually activated later.  The "DefaultDatabase" database will be created the first time this configuration is run.</description>
             <depends packname="J2EE Features" />
         </pack>
-        <pack name="UDDI Server" required="no" preselected="no">
-            <!-- o/o/g/juddiServer/1.0-SNAPSHOT -->
-            <description>A UDDI server that runs in Geronimo, using the jUDDI package.  If not selected, this configuration will be available but would need to be manually activated later.</description>
-            <depends packname="J2EE Features" />
-        </pack>
         <pack name="Spring Integration" required="no" preselected="no">
             <!-- o/o/g/SpringRuntime -->
             <!-- o/o/g/SpringDeployer -->
@@ -94,13 +145,7 @@
         <pack name="JMX Debug Web Application" required="no" preselected="yes">
             <!-- o/o/g/DebugConsole -->
             <description>A web application that lets you display the JMX data from a running Geronimo server.  This can be useful to see exactly what features are enabled in Geronimo and to help resolve resource mapping failures.  However, it is not very user-friendly compared to, for example, the web management console.  The debug application can typically be reached at http://localhost:8080/debug-tool/ though the default port may be changed on the web configuration screen.  If not selected, the JMX debug application will be installed but would need to be manually activated later.</description>
-            <depends packname="J2EE Features" />
-        </pack>
-        <pack name="Demo Web Application" required="no" preselected="no">
-            <!-- o/o/g/Demo -->
-            <!-- o/o/g/SampleSecurityRealm -->
-            <description>A sample web application that runs in Geronimo.  The demo application can typically be reached at http://localhost:8080/demo/ though the default port may be changed on the web configuration screen.  If not selected, the demo application will be installed but would need to be manually activated later.</description>
-            <depends packname="J2EE Features" />
+            <depends packname="Jetty Web Container" />
         </pack>
     </packs>
 </installation>

Modified: geronimo/branches/1.0-M5/modules/assembly/src/izpack/izpack-process.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/assembly/src/izpack/izpack-process.xml?rev=292868&r1=292867&r2=292868&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/assembly/src/izpack/izpack-process.xml (original)
+++ geronimo/branches/1.0-M5/modules/assembly/src/izpack/izpack-process.xml Fri Sep 30 15:32:12 2005
@@ -1,171 +1,287 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <processing>
-  <!-- J2EE Features -->
-  <job name="Activating RMI naming configuration">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/RMINaming</arg>
-    </executefile>
-    <executeForPack name="J2EE Features" />
-  </job>
-  <job name="Activating base J2EE configuration">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/System</arg>
-    </executefile>
-    <executeForPack name="J2EE Features" />
-  </job>
-  <job name="Activating J2EE deployer">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/RuntimeDeployer</arg>
-    </executefile>
-    <executeForPack name="J2EE Features" />
-  </job>
-  <job name="Activating embedded database">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/SystemDatabase</arg>
-    </executefile>
-    <executeForPack name="J2EE Features" />
-  </job>
-  <job name="Activating JMS broker">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/ActiveMQServer</arg>
-    </executefile>
-    <executeForPack name="J2EE Features" />
-  </job>
-  <job name="Activating system JMS destinations">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/SystemJMS</arg>
-    </executefile>
-    <executeForPack name="J2EE Features" />
-  </job>
-
-  <!-- Web Management Console -->
-  <job name="Activating Web management console">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/Console</arg>
-    </executefile>
-    <executeForPack name="Web Management Console" />
-  </job>
-  
-  <!-- LDAP Server -->
-  <job name="Activating LDAP server">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/Directory</arg>
-    </executefile>
-    <executeForPack name="LDAP Server" />
-  </job>
-  
-  <!-- Sample Database Pool -->
-  <job name="Activating sample database pool">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/DefaultDatabase</arg>
-    </executefile>
-    <executeForPack name="Sample Database Pool" />
-  </job>
-  
-  <!-- UDDI Server -->
-  <job name="Activating UDDI server">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/juddiServer/1.0-SNAPSHOT</arg>
-    </executefile>
-    <executeForPack name="UDDI Server" />
-  </job>
-  
-  <!-- Spring Integration -->
-  <job name="Activating Spring integration">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/SpringRuntime</arg>
-    </executefile>
-    <executeForPack name="Spring Integration" />
-  </job>
-  
-  <job name="Activating Spring module deployer">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/SpringDeployer</arg>
-    </executefile>
-    <executeForPack name="Spring Integration" />
-  </job>
-  
-  <!-- JMX Debug Web Application -->
-  <job name="Activating JMX debug application">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/DebugConsole</arg>
-    </executefile>
-    <executeForPack name="JMX Debug Web Application" />
-  </job>
-  
-  <!-- Demo Web Application -->
-  <job name="Activating sample security realm">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/SampleSecurityRealm</arg>
-    </executefile>
-    <executeForPack name="Demo Web Application" />
-  </job>
-  
-  <job name="Activating demo web application">
-    <executefile name="$JAVA_HOME/bin/java">
-      <arg>-classpath</arg>
-      <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
-      <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
-      <arg>$INSTALL_PATH/var/config/config.list</arg>
-      <arg>org/apache/geronimo/Demo</arg>
-    </executefile>
-    <executeForPack name="Demo Web Application" />
-  </job>
-<!--  <job name="Finished" /> -->
+    <!-- J2EE Features -->
+    <job name="Activating RMI naming configuration">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/RMINaming</arg>
+        </executefile>
+        <executeForPack name="J2EE Features"/>
+    </job>
+    <job name="Activating base J2EE configuration">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/Server</arg>
+        </executefile>
+        <executeForPack name="J2EE Features"/>
+    </job>
+    <job name="Activating J2EE Security">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/Security</arg>
+        </executefile>
+        <executeForPack name="J2EE Features"/>
+    </job>
+    <job name="Activating J2EE deployer">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/RuntimeDeployer</arg>
+        </executefile>
+        <executeForPack name="J2EE Features"/>
+    </job>
+    <job name="Activating embedded database">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/SystemDatabase</arg>
+        </executefile>
+        <executeForPack name="J2EE Features"/>
+    </job>
+
+    <!-- corba -->
+    <job name="Activating base J2EE configuration">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/ServerCORBA</arg>
+        </executefile>
+        <executeForPack name="CORBA Features"/>
+    </job>
+
+    <!-- jms -->
+    <job name="Activating JMS broker">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/ActiveMQServer</arg>
+        </executefile>
+        <executeForPack name="JMS Features"/>
+    </job>
+    <job name="Activating system JMS destinations">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/SystemJMS</arg>
+        </executefile>
+        <executeForPack name="JMS Features"/>
+    </job>
+
+    <!-- Jetty -->
+    <job name="Activating Jetty Web Container">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/Jetty</arg>
+        </executefile>
+        <executeForPack name="Jetty Web Container"/>
+    </job>
+    <job name="Activating Jetty Deployer">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/JettyRuntimeDeployer</arg>
+        </executefile>
+        <executeForPack name="Jetty Web Container"/>
+    </job>
+
+    <!-- Jetty Welcome app -->
+    <job name="Activating Jetty Welcome Application">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/applications/Welcome/Jetty</arg>
+        </executefile>
+        <executeForPack name="Jetty Welcome Application"/>
+    </job>
+
+     <!-- Jetty Web Management Console -->
+    <job name="Activating Jetty Web management console">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/Console/Jetty</arg>
+        </executefile>
+        <executeForPack name="Jetty Web Management Console"/>
+    </job>
+
+    <!-- Jetty UDDI Server -->
+    <job name="Activating Jetty UDDI server">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/juddiServer/${GeronimoVersion}/Jetty</arg>
+        </executefile>
+        <executeForPack name="Jetty UDDI Server"/>
+    </job>
+
+    <!-- Tomcat -->
+    <job name="Activating Tomcat Web Container">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/Tomcat</arg>
+        </executefile>
+        <executeForPack name="Tomcat Web Container"/>
+    </job>
+    <job name="Activating Tomcat Deployer">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/TomcatRuntimeDeployer</arg>
+        </executefile>
+        <executeForPack name="Tomcat Web Container"/>
+    </job>
+
+    <!-- Tomcat Welcome app -->
+    <job name="Activating Tomcat Welcome Application">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/applications/Welcome/Tomcat</arg>
+        </executefile>
+        <executeForPack name="Tomcat Welcome Application"/>
+    </job>
+
+     <!-- Tomcat Web Management Console -->
+    <job name="Activating Tomcat Web management console">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/Console/Tomcat</arg>
+        </executefile>
+        <executeForPack name="Tomcat Web Management Console"/>
+    </job>
+
+    <!-- Tomcat UDDI Server -->
+    <job name="Activating Tomcat UDDI server">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/juddiServer/${GeronimoVersion}/Tomcat</arg>
+        </executefile>
+        <executeForPack name="Tomcat UDDI Server"/>
+    </job>
+
+    <!-- LDAP Server -->
+    <job name="Activating LDAP server">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/Directory</arg>
+        </executefile>
+        <executeForPack name="LDAP Server"/>
+    </job>
+
+    <!-- Sample Database Pool -->
+    <job name="Activating sample database pool">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/DefaultDatabase</arg>
+        </executefile>
+        <executeForPack name="Sample Database Pool"/>
+    </job>
+
+    <!-- Spring Integration -->
+    <job name="Activating Spring integration">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/SpringRuntime</arg>
+        </executefile>
+        <executeForPack name="Spring Integration"/>
+    </job>
+
+    <job name="Activating Spring module deployer">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/SpringDeployer</arg>
+        </executefile>
+        <executeForPack name="Spring Integration"/>
+    </job>
+
+    <!-- JMX Debug Web Application -->
+    <job name="Activating JMX debug application">
+        <executefile name="$JAVA_HOME/bin/java">
+            <arg>-classpath</arg>
+            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
+            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
+            <arg>$INSTALL_PATH/var/config/config.list</arg>
+            <arg>org/apache/geronimo/DebugConsole</arg>
+        </executefile>
+        <executeForPack name="JMX Debug Web Application"/>
+    </job>
+
+    <!-- Demo Web Application -->
+<!--    <job name="Activating sample security realm">-->
+<!--        <executefile name="$JAVA_HOME/bin/java">-->
+<!--            <arg>-classpath</arg>-->
+<!--            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>-->
+<!--            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>-->
+<!--            <arg>$INSTALL_PATH/var/config/config.list</arg>-->
+<!--            <arg>org/apache/geronimo/SampleSecurityRealm</arg>-->
+<!--        </executefile>-->
+<!--        <executeForPack name="Demo Web Application"/>-->
+<!--    </job>-->
+
+<!--    <job name="Activating demo web application">-->
+<!--        <executefile name="$JAVA_HOME/bin/java">-->
+<!--            <arg>-classpath</arg>-->
+<!--            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>-->
+<!--            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>-->
+<!--            <arg>$INSTALL_PATH/var/config/config.list</arg>-->
+<!--            <arg>org/apache/geronimo/Demo</arg>-->
+<!--        </executefile>-->
+<!--        <executeForPack name="Demo Web Application"/>-->
+<!--    </job>-->
+    <!--  <job name="Finished" /> -->
 </processing>

Modified: geronimo/branches/1.0-M5/modules/assembly/src/izpack/izpack-user-input.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/assembly/src/izpack/izpack-user-input.xml?rev=292868&r1=292867&r2=292868&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/assembly/src/izpack/izpack-user-input.xml (original)
+++ geronimo/branches/1.0-M5/modules/assembly/src/izpack/izpack-user-input.xml Fri Sep 30 15:32:12 2005
@@ -1,109 +1,188 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <userInput>
-  <panel order="0">
-    <field type="title" txt="Security Configuration" />
-    <field type="staticText" txt="Please select security 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="rule" variable="PlanRemoteLoginPort">
-      <description txt="The network port that should be used to listen for remote login attempts" />
-      <spec txt="Remote Login Port:" layout="N:5:5" set="0:4242" />
-      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
-      <createForPack name="J2EE Features" />
-    </field>
-  </panel>
-  <panel order="1">
-    <field type="title" txt="Web Configuration" />
-    <field type="staticText" txt="Please select Web server configuration options for Geronimo"/>
-    <divider />
-    <field type="text" variable="PlanServerHostname">
-      <description txt="Hostname the server should bind to (usually localhost or 0.0.0.0)" />
-      <spec txt="Hostname:" size="50" set="localhost" />
-      <createForPack name="Server" />
-    </field>
-    <field type="rule" variable="PlanHTTPPort">
-      <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="PlanHTTPSPort">
-      <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="PlanAJPPort">
-      <description txt="The Apache AJP network port that the web container should use" />
-      <spec txt="AJP Port:" layout="N:5:5" set="0:8009" />
-      <validator class="com.izforge.izpack.util.NotEmptyValidator" />
-      <createForPack name="J2EE Features" />
-    </field>
-  </panel>
-  <panel order="2">
-    <field type="title" txt="EJB/IIOP Configuration" />
-    <field type="staticText" txt="Please select EJB server configuration options for Geronimo"/>
-    <divider />
-    <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="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>
-    <field type="text" variable="PlanClientAddresses">
-      <description txt="IP addresses the server should accept EJB client connections from" />
-      <spec txt="Clients:" size="50" set="127.0.0.1" />
-      <createForPack name="J2EE Features" />
-    </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>
-  </panel>
-  <panel order="3">
-    <field type="title" txt="Service Configuration" />
-    <field type="staticText" txt="Please configure additional 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="J2EE Features" />
-    </field>
-  </panel>
+    <panel order="0">
+        <field type="title" txt="Security Configuration"/>
+        <field type="staticText" txt="Please select security 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="rule" variable="PlanRemoteLoginPort">
+            <description txt="The network port that should be used to listen for remote login attempts"/>
+            <spec txt="Remote Login Port:" layout="N:5:5" set="0:4242"/>
+            <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
+            <createForPack name="J2EE Features"/>
+        </field>
+    </panel>
+    <panel order="1">
+        <field type="title" txt="Jetty Web Configuration"/>
+        <field type="staticText" txt="Please select Jetty Web server configuration options for Geronimo"/>
+        <divider/>
+        <field type="text" variable="PlanServerHostname">
+            <description txt="Hostname the server should bind to (usually localhost or 0.0.0.0)"/>
+            <spec txt="Hostname:" size="50" set="0.0.0.0"/>
+            <createForPack name="Jetty Web Container"/>
+        </field>
+        <field type="rule" variable="PlanHTTPPort">
+            <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="Jetty Web Container"/>
+        </field>
+        <field type="rule" variable="PlanHTTPSPort">
+            <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="Jetty Web Container"/>
+        </field>
+        <field type="rule" variable="PlanAJPPort">
+            <description txt="The Apache AJP network port that the web container should use"/>
+            <spec txt="AJP Port:" layout="N:5:5" set="0:8009"/>
+            <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
+            <createForPack name="Jetty Web Container"/>
+        </field>
+        <field type="text" variable="PlanWebServerName">
+            <description txt="Name of web container (do not modify)"/>
+            <spec txt="Web Server (Do not modify)" size="5" set="Jetty"/>
+            <createForPack name="Jetty Web Container"/>
+        </field>
+        <field type="text" variable="PlanWebBuilderDefaultNamespace">
+            <description txt="Namspace for web plan schema (do not modify)"/>
+            <spec txt="Web plan namespace (Do not modify)" size="53" set="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"/>
+            <createForPack name="Jetty Web Container"/>
+        </field>
+    </panel>
+    <panel order="2">
+        <field type="title" txt="Tomcat Web Configuration"/>
+        <field type="staticText" txt="Please select Tomcat Web server configuration options for Geronimo"/>
+        <divider/>
+        <field type="text" variable="PlanServerHostname">
+            <description txt="Hostname the server should bind to (usually localhost or 0.0.0.0)"/>
+            <spec txt="Hostname:" size="50" set="0.0.0.0"/>
+            <createForPack name="Tomcat Web Container"/>
+        </field>
+        <field type="rule" variable="PlanHTTPPort2">
+            <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="Tomcat Web Container"/>
+        </field>
+        <field type="rule" variable="PlanHTTPSPort2">
+            <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="Tomcat Web Container"/>
+        </field>
+        <field type="rule" variable="PlanAJPPort2">
+            <description txt="The Apache AJP network port that the web container should use"/>
+            <spec txt="AJP Port:" layout="N:5:5" set="0:8009"/>
+            <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
+            <createForPack name="Tomcat Web Container"/>
+        </field>
+        <field type="text" variable="PlanWebServerName">
+            <description txt="Name of web container (do not modify)"/>
+            <spec txt="Web Server (Do not modify)" size="5" set="Tomcat"/>
+            <createForPack name="Tomcat Web Container"/>
+        </field>
+        <field type="text" variable="PlanWebBuilderDefaultNamespace">
+            <description txt="Namspace for web plan schema (do not modify)"/>
+            <spec txt="Web plan namespace (Do not modify)" size="55" set="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"/>
+            <createForPack name="Tomcat Web Container"/>
+        </field>
+    </panel>
+    <panel order="3">
+        <field type="title" txt="EJB Configuration"/>
+        <field type="staticText" txt="Please select EJB server configuration options for Geronimo"/>
+        <divider/>
+        <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="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>
+        <field type="text" variable="PlanClientAddresses">
+            <description txt="IP addresses the server should accept EJB client connections from"/>
+            <spec txt="Clients:" size="50" set="0.0.0.0"/>
+            <createForPack name="J2EE Features"/>
+        </field>
+    </panel>
+    <panel order="4">
+        <field type="title" txt="CORBA Configuration"/>
+        <field type="staticText" txt="Please select CORBA configuration options for Geronimo"/>
+        <divider/>
+        <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="CORBA Features"/>
+        </field>
+        <field type="text" variable="PlanORBSSLHost">
+            <description txt="The network port that the IIOP ORB should use. Do not change, it cannot be reset from the installer."/>
+            <spec txt="ORB Host:" size="50" set="localhost"/>
+            <createForPack name="CORBA Features"/>
+        </field>
+        <field type="rule" variable="PlanORBSSLPort">
+            <description txt="The network port that the IIOP ORB should use. Do not change, it cannot be reset from the installer."/>
+            <spec txt="ORB Port:" layout="N:5:5" set="0:2001"/>
+            <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
+            <createForPack name="CORBA Features"/>
+        </field>
+        <field type="text" variable="PlanCOSNamingHost">
+            <description txt="The network port that the CORBA Naming Service should use"/>
+            <spec txt="CosNaming Host:" size="50" set="localhost"/>
+            <createForPack name="CORBA 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="CORBA Features"/>
+        </field>
+    </panel>
+    <panel order="5">
+        <field type="title" txt="Derby Configuration"/>
+        <field type="staticText" txt="Please configure Derby"/>
+        <divider/>
+        <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="J2EE Features"/>
+        </field>
+    </panel>
+    <panel order="6">
+        <field type="title" txt="Activemq Configuration"/>
+        <field type="staticText" txt="Please configure activemq 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="JMS Features"/>
+        </field>
+    </panel>
+    <panel order="7">
+        <field type="title" txt="Directory (LDAP) Configuration"/>
+        <field type="staticText" txt="Please configure Directory services"/>
+        <divider/>
+        <field type="rule" variable="PlanLdapPort">
+            <description txt="The network port that the directory server should use"/>
+            <spec txt="Directory Port:" layout="N:5:5" set="0:1389"/>
+            <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
+            <createForPack name="LDAP Server"/>
+        </field>
+    </panel>
 </userInput>

Added: geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.izpack.list
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.izpack.list?rev=292868&view=auto
==============================================================================
--- geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.izpack.list (added)
+++ geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.izpack.list Fri Sep 30 15:32:12 2005
@@ -0,0 +1,3 @@
+org/apache/geronimo/System
+#Following configurations are added by the installer
+

Modified: geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.jetty.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.jetty.xml?rev=292868&r1=292867&r2=292868&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.jetty.xml (original)
+++ geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.jetty.xml Fri Sep 30 15:32:12 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<attributes>
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
     <configuration name="org/apache/geronimo/RMINaming">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>

Modified: geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.list
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.list?rev=292868&r1=292867&r2=292868&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.list (original)
+++ geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.list Fri Sep 30 15:32:12 2005
@@ -9,3 +9,4 @@
 org/apache/geronimo/TomcatRuntimeDeployer
 org/apache/geronimo/applications/Welcome/${PlanWebServerName}
 org/apache/geronimo/Console/${PlanWebServerName}
+ 
\ No newline at end of file

Modified: geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.tomcat.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.tomcat.xml?rev=292868&r1=292867&r2=292868&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.tomcat.xml (original)
+++ geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.tomcat.xml Fri Sep 30 15:32:12 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<attributes>
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
     <configuration name="org/apache/geronimo/RMINaming">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>

Modified: geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.xml?rev=292868&r1=292867&r2=292868&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.xml (original)
+++ geronimo/branches/1.0-M5/modules/assembly/src/var/config/config.xml Fri Sep 30 15:32:12 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<attributes>
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
     <configuration name="org/apache/geronimo/RMINaming">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
@@ -67,7 +67,18 @@
         <gbean name="JMXConnector">
             <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
         </gbean>
-        <!-- Add CORBA settings PlanIIOPPort, PlanORBPort, PlanCOSNamingPort -->
+    </configuration>
+    <configuration name="org/apache/geronimo/ServerCORBA">
+        <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="org/apache/geronimo/ActiveMQServer">
         <gbean name="ActiveMQ.tcp.default">



Mime
View raw message