geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r219238 - in /geronimo/trunk/modules/assembly: project.xml src/izpack/geronimo-izpack.xml src/izpack/izpack-process.xml
Date Fri, 15 Jul 2005 19:34:54 GMT
Author: ammulder
Date: Fri Jul 15 12:34:52 2005
New Revision: 219238

URL: http://svn.apache.org/viewcvs?rev=219238&view=rev
Log:
Merge installer script changes from M4 branch

Modified:
    geronimo/trunk/modules/assembly/project.xml
    geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml
    geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml

Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=219238&r1=219237&r2=219238&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Fri Jul 15 12:34:52 2005
@@ -1204,6 +1204,7 @@
             <type>war</type>
             <properties>
                 <repository>true</repository>
+                <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=219238&r1=219237&r2=219238&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/geronimo-izpack.xml Fri Jul 15 12:34:52 2005
@@ -38,13 +38,11 @@
             <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="RELEASE-NOTES-1.0-M4.txt" targetdir="$INSTALL_PATH"/>
             <file src="bin" targetdir="$INSTALL_PATH"/>
             <file src="lib" targetdir="$INSTALL_PATH"/>
             <file src="config-store" targetdir="$INSTALL_PATH"/>
@@ -70,10 +68,11 @@
             <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/interop-server-plan.xml" targetdir="$INSTALL_PATH/installer-temp"/>
+            <parsable targetfile="$INSTALL_PATH/installer-temp/interop-server-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="Jetty Web Container" required="yes">
             <description>Geronimo uses the Jetty web container by default.  It is currently
required for J2EE configurations.</description>
@@ -95,6 +94,10 @@
         <pack name="Demo Web Application" required="no">
             <description>A sample web app that runs in Geronimo</description>
             <file src="wars/geronimo-demo-${GeronimoVersion}.war" targetdir="$INSTALL_PATH/installer-temp"/>
+        </pack>
+        <pack name="UDDI Server" required="no" preselected="no">
+            <description>A UDDI server that runs in Geronimo</description>
+            <file src="wars/geronimo-uddi-server-${GeronimoVersion}.war" targetdir="$INSTALL_PATH/installer-temp"/>
         </pack>
         <pack name="Sample Axion Database" required="no" preselected="no">
             <description>A sample embedded database, using the Axion RDBMS</description>

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=219238&r1=219237&r2=219238&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml Fri Jul 15 12:34:52 2005
@@ -142,14 +142,14 @@
     </executefile>
     <executeForPack name="Demo Web Application" />
   </job>
-  <job name="Install Remote ClassLoader Configuration">
+  <job name="Install UDDI Server">
     <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>
+      <arg>$INSTALL_PATH/installer-temp/geronimo-uddi-server-${GeronimoVersion}.war</arg>
     </executefile>
-    <executeForPack name="J2EE Features" />
+    <executeForPack name="UDDI Server" />
   </job>
   <job name="Install Axion Database Configuration">
     <executefile name="$JAVA_HOME/bin/java">



Mime
View raw message