geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r170122 - in /geronimo/trunk: RELEASE-NOTES-1.0-M4.txt modules/assembly/maven.xml modules/assembly/project.xml modules/assembly/src/izpack/geronimo-izpack.xml modules/assembly/src/izpack/izpack-process.xml modules/assembly/src/izpack/izpack-user-input.xml
Date Sat, 14 May 2005 05:21:52 GMT
Author: ammulder
Date: Fri May 13 22:21:51 2005
New Revision: 170122

URL: http://svn.apache.org/viewcvs?rev=170122&view=rev
Log:
Add placeholder for next release's release notes

Update installer configuration to be correct (if slow) for the current
  Geronimo configuration

Added:
    geronimo/trunk/RELEASE-NOTES-1.0-M4.txt   (with props)
Modified:
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/project.xml
    geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml
    geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml
    geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml

Added: geronimo/trunk/RELEASE-NOTES-1.0-M4.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/RELEASE-NOTES-1.0-M4.txt?rev=170122&view=auto
==============================================================================
--- geronimo/trunk/RELEASE-NOTES-1.0-M4.txt (added)
+++ geronimo/trunk/RELEASE-NOTES-1.0-M4.txt Fri May 13 22:21:51 2005
@@ -0,0 +1,75 @@
+Release Notes -- Apache Geronimo -- Version 1.0-M4
+
+NOTE: THIS IS A PLACEHOLDER.  THERE HAS NOT BEEN AN OFFICIAL M4 RELEASE
+YET.  YOU MAY LOOK AT THE FILE RELEASE-NOTES-1.0-M3.txt IN YOUR
+GERONIMO DISTRIBUTION FOR THE RELEASE NOTES FROM THE LAST MILESTONE, BUT
+THOSE ARE SOMEWHAT OUT OF DATE.
+
+
+Geronimo URLs
+-------------
+Home Page:     http://geronimo.apache.org/
+Downloads:     http://geronimo.apache.org/download.html
+Documentation: http://geronimo.apache.org/documentation.html
+Mailing Lists: http://geronimo.apache.org/mailing.html
+Source Code:   http://geronimo.apache.org/source.html
+Bug Tracking:  http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10220
+Wiki:          http://wiki.apache.org/geronimo
+
+
+System Requirements
+-------------------
+You need a platform that supports JDK 1.4 or JDK 1.5 (and some
+features such as HTTPS currently depend on Sun implementation
+classes, so a Sun JVM would be the best bet).
+
+Most testing has been done on Linux, Mac OS X, and Windows.  For a
+list of notes on specific configurations, see
+http://wiki.apache.org/geronimo/KnownWorkingConfigurations
+
+Installing & Starting Geronimo
+------------------------------
+To install, simply unpack the zip or tar file containing Geronimo.
+
+To start Geronimo, change to the Geronimo directory and run
+
+   java -jar bin/server.jar
+
+
+Current Project Status at a Glance
+----------------------------------
+http://wiki.apache.org/geronimo/RoadMap
+
+
+Significant Changes Since the M3 Release
+----------------------------------------
+  == FILL ME IN ==
+
+
+Significant Missing Features
+----------------------------
+  == FILL ME IN ==
+
+
+Overall Project Status
+----------------------
+Geronimo is currently undergoing TCK testing.  Many features work, but
+it is not fully J2EE compliant yet.  Geronimo has also not been
+extensively performance tested.  Your help would be appreciated!
+
+Documentation efforts are underway, and freely available documentation
+covers many of the more stable aspects of the product.
+
+For more information on specific bugs or features, or to help with
+testing efforts, please visit JIRA, our bug/issue tracking system, at
+http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10220
+
+
+Specific Issues Addressed in M4 Release
+---------------------------------------
+
+** New Features
+
+** Improvements
+
+** Bug Fixes

Propchange: geronimo/trunk/RELEASE-NOTES-1.0-M4.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=170122&r1=170121&r2=170122&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Fri May 13 22:21:51 2005
@@ -159,6 +159,7 @@
         <ant:copy todir="${distDir}/var">
             <ant:fileset dir="src/var"/>
         </ant:copy>
+        <ant:copy todir="${distDir}/var/catalina/conf" file="${project.root}/modules/tomcat/src/var/web.xml"/>
 
         <!-- Pre-load the server's repository -->
         <ant:mkdir dir="${distDir}/repository"/>
@@ -197,8 +198,16 @@
 
         <!-- Preprocess all mungible content using velocity  -->
 
-        <!-- Copy over the IzPack Installer configuration files -->
-        <ant:mkdir dir="${basedir}/target/installer"/>
+        <!-- Copy over the IzPack Installer files -->
+        <ant:mkdir dir="${basedir}/target/installer/wars"/>
+
+        <j:forEach var="artifact" items="${pom.artifacts}">
+            <j:set var="dependency" value="${artifact.dependency}"/>
+            <j:if test="${dependency.getProperty('installer') == 'true'}">
+                <ant:copy todir="${basedir}/target/installer/wars" file="${artifact.path}"/>
+            </j:if>
+        </j:forEach>
+
         <fileScanner var="installFiles">
             <fileset dir="${basedir}/src/izpack">
                 <include name="*.xml"/>
@@ -207,7 +216,7 @@
         <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: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>
@@ -472,8 +481,6 @@
                 <ant:arg value="distribute"/>
                 <ant:arg value="target/plan/j2ee-server-tomcat-plan.xml"/>
             </ant:java>
-
-            <ant:copy todir="${distDir}/var/catalina/conf" file="${project.root}/modules/tomcat/src/var/web.xml"/>
 
             <!-- build the Demo configuration -->
             <ant:echo>Building demo website configuration</ant:echo>

Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=170122&r1=170121&r2=170122&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Fri May 13 22:21:51 2005
@@ -92,6 +92,7 @@
         <!--     deploy: include dependency in deployer classpath       -->
         <!--     repository: copy dependency into repository (Note: all -->
         <!--         geronimojars are always copied to repository)      -->
+        <!--     installer: copied to the installer/wars directory      -->
         <!-- ========================================================== -->
         <dependency>
             <groupId>geronimo</groupId>
@@ -442,6 +443,38 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-jmxdebug</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>war</type>
+            <properties>
+                <installer>true</installer>
+            </properties>
+        </dependency>
+
+        <!-- Not currently deployed
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-console-web</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>war</type>
+            <properties>
+                <installer>true</installer>
+            </properties>
+        </dependency>
+        -->
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-demo</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>war</type>
+            <properties>
+                <installer>true</installer>
             </properties>
         </dependency>
 

Modified: 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=170122&r1=170121&r2=170122&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml Fri May 13 22:21:51 2005
@@ -26,6 +26,7 @@
         <panel classname="TargetPanel"/>
         <panel classname="PacksPanel"/>
         <panel classname="UserInputPanel"/>
+        <panel classname="UserInputPanel"/>
         <panel classname="InstallPanel"/>
         <panel classname="ProcessPanel"/>
         <panel classname="InfoPanel"/>
@@ -52,36 +53,51 @@
             <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"/>
+            <file src="plan-src/j2ee-deployer-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
+            <file src="plan-src/deployer-system-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
+            <file src="plan-src/system-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
+            <parsable targetfile="$INSTALL_PATH/installer-temp/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"/>
+            <file src="plan-src/j2ee-server-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
+            <parsable targetfile="$INSTALL_PATH/installer-temp/j2ee-server-plan.xml" type="xml"/>
+            <file src="plan-src/j2ee-runtime-deployer-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
+            <file src="plan-src/system-database-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
+            <parsable targetfile="$INSTALL_PATH/installer-temp/system-database-plan.xml"
type="xml"/>
+            <file src="plan-src/system-activemq-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
+            <parsable targetfile="$INSTALL_PATH/installer-temp/system-activemq-plan.xml"
type="xml"/>
+            <file src="plan-src/system-jms-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
+            <parsable targetfile="$INSTALL_PATH/installer-temp/system-jms-plan.xml" type="xml"/>
+            <file src="plan-src/j2ee-secure-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
+            <file src="plan-src/client-system-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
+            <file src="plan-src/j2ee-client-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
+            <file src="plan-src/j2ee-remote-classloading-deployer-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
         </pack>
-        <pack name="JMX Console Web App" required="no">
+        <pack name="Jetty Web Container" required="yes">
+            <description>Geronimo uses the Jetty web container by default.  It is currently
required for J2EE configurations.</description>
+        </pack>
+        <pack name="Tomcat Web Container" required="no" preselected="no">
+            <description>Geronimo uses the Jetty web container by default.  If you'd
like Tomcat to be available as well, select this package.  It is currently in addition to
Jetty, not instead of Jetty.</description>
+            <file src="plan-src/j2ee-server-tomcat-plan.xml" targetdir="$INSTALL_PATH/installer-temp"
/>
+            <parsable targetfile="$INSTALL_PATH/installer-temp/j2ee-server-tomcat-plan.xml"
type="xml"/>
+        </pack>
+        <pack name="Spring Integration" required="no">
+            <description>Features to run Spring applications in Geronimo without any
additional J2EE packaging</description>
+            <file src="plan-src/spring-runtime-plan.xml" targetdir="$INSTALL_PATH/installer-temp"
/>
+            <file src="plan-src/spring-deployer-plan.xml" targetdir="$INSTALL_PATH/installer-temp"
/>
+        </pack>
+        <pack name="JMX Debug Tool 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"/>
+            <file src="wars/geronimo-jmxdebug-${GeronimoVersion}.war" targetdir="$INSTALL_PATH/installer-temp"/>
         </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"/>
+            <file src="wars/geronimo-demo-${GeronimoVersion}.war" targetdir="$INSTALL_PATH/installer-temp"/>
         </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 name="Sample Axion Database" required="no" preselected="no">
+            <description>A sample embedded database, using the Axion RDBMS</description>
+            <file src="plan-src/default-database-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
         </pack>
     </packs>
 </installation>

Modified: 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=170122&r1=170121&r2=170122&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml Fri May 13 22:21:51 2005
@@ -9,8 +9,10 @@
       <arg>$SERVER_CLASSPATH</arg>
       <arg>--mainClass</arg>
       <arg>org.apache.geronimo.system.main.Daemon</arg>
+      <arg>--endorsedDirs</arg>
+      <arg>lib/endorsed</arg>
       <arg>--install</arg>
-      <arg>$INSTALL_PATH/server-plans/system-plan.xml</arg>
+      <arg>$INSTALL_PATH/installer-temp/system-plan.xml</arg>
       <arg>$INSTALL_PATH/bin/server.jar</arg>
     </executefile>
     <executeForPack name="Server" />
@@ -20,17 +22,41 @@
       <arg>-jar</arg>
       <arg>$INSTALL_PATH/bin/deployer.jar</arg>
       <arg>distribute</arg>
-      <arg>$INSTALL_PATH/server-plans/j2ee-server-plan.xml</arg>
+      <arg>$INSTALL_PATH/installer-temp/j2ee-server-plan.xml</arg>
     </executefile>
     <executeForPack name="J2EE Features" />
   </job>
+  <job name="Install Deployer Configuration">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/installer-temp/j2ee-runtime-deployer-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/installer-temp/client-system-plan.xml</arg>
+      <arg>$INSTALL_PATH/bin/client.jar</arg>
+    </executefile>
+    <executeForPack name="Server" />
+  </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>
+      <arg>$INSTALL_PATH/installer-temp/system-database-plan.xml</arg>
+      <arg>$INSTALL_PATH/repository/geronimo/rars/geronimo-derby-connector-${GeronimoVersion}.rar</arg>
     </executefile>
     <executeForPack name="J2EE Features" />
   </job>
@@ -39,7 +65,7 @@
       <arg>-jar</arg>
       <arg>$INSTALL_PATH/bin/deployer.jar</arg>
       <arg>distribute</arg>
-      <arg>$INSTALL_PATH/server-plans/system-activemq-plan.xml</arg>
+      <arg>$INSTALL_PATH/installer-temp/system-activemq-plan.xml</arg>
     </executefile>
     <executeForPack name="J2EE Features" />
   </job>
@@ -48,70 +74,92 @@
       <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>
+      <arg>$INSTALL_PATH/installer-temp/system-jms-plan.xml</arg>
+      <arg>$INSTALL_PATH/repository/activemq/rars/activemq-ra-${activemq_version}.rar</arg>
     </executefile>
     <executeForPack name="J2EE Features" />
   </job>
+  <job name="Install Spring Configuration">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/installer-temp/spring-runtime-plan.xml</arg>
+    </executefile>
+    <executeForPack name="Spring Integration" />
+  </job>
+  <job name="Install Spring Deployer">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/installer-temp/spring-deployer-plan.xml</arg>
+    </executefile>
+    <executeForPack name="Spring Integration" />
+  </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>
+      <arg>$INSTALL_PATH/installer-temp/j2ee-secure-plan.xml</arg>
     </executefile>
     <executeForPack name="J2EE Features" />
   </job>
-  <job name="Construct Client Container Executable">
+  <job name="Install Client Configuration">
     <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>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/installer-temp/j2ee-client-plan.xml</arg>
     </executefile>
-    <executeForPack name="Server" />
+    <executeForPack name="J2EE Features" />
   </job>
-  <job name="Install Client Configuration">
+  <job name="Install Tomcat 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>
+      <arg>$INSTALL_PATH/installer-temp/j2ee-server-tomcat-plan.xml</arg>
     </executefile>
     <executeForPack name="J2EE Features" />
   </job>
-  <job name="Install JMX Console Web App Configuration">
+  <job name="Install JMX Debug Tool 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>
+      <arg>$INSTALL_PATH/installer-temp/geronimo-jmxdebug-${GeronimoVersion}.war</arg>
     </executefile>
-    <executeForPack name="JMX Console Web App" />
+    <executeForPack name="JMX Debug Tool 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>
+      <arg>$INSTALL_PATH/installer-temp/geronimo-demo-${GeronimoVersion}.war</arg>
     </executefile>
     <executeForPack name="Demo Web Application" />
   </job>
-  <job name="Install Sample Derby Database Configuration">
+  <job name="Install Remote ClassLoader Configuration">
+    <executefile name="$JAVA_HOME/bin/java">
+      <arg>-jar</arg>
+      <arg>$INSTALL_PATH/bin/deployer.jar</arg>
+      <arg>distribute</arg>
+      <arg>$INSTALL_PATH/installer-temp/j2ee-remote-classloading-deployer-plan.xml</arg>
+    </executefile>
+    <executeForPack name="J2EE Features" />
+  </job>
+  <job name="Install Axion 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>
+      <arg>$INSTALL_PATH/installer-temp/default-database-plan.xml</arg>
+      <arg>$INSTALL_PATH/repository/tranql/rars/tranql-connector-${tranql_connector_version}.rar</arg>
     </executefile>
-    <executeForPack name="Sample Derby Database" />
+    <executeForPack name="Sample Axion Database" />
   </job>
+  <job name="Finished" />
 </processing>

Modified: 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=170122&r1=170121&r2=170122&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/izpack-user-input.xml Fri May 13 22:21:51 2005
@@ -63,7 +63,7 @@
       <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" />
+      <createForPack name="J2EE Features" />
     </field>
     <field type="rule" variable="PlanIIOPPort">
       <description txt="The network port that the RMI/IIOP listener should use" />



Mime
View raw message