portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r512960 - in /portals/jetspeed-2/trunk/installer2: antinstall-config-full.xml antinstall-config-min.xml build.xml
Date Wed, 28 Feb 2007 20:47:37 GMT
Author: ate
Date: Wed Feb 28 12:47:36 2007
New Revision: 512960

URL: http://svn.apache.org/viewvc?view=rev&rev=512960
Log:
Fix for seeding the right data depending on the type of installation (min,full).
Patch provided by Hajo Birthelmer

Modified:
    portals/jetspeed-2/trunk/installer2/antinstall-config-full.xml
    portals/jetspeed-2/trunk/installer2/antinstall-config-min.xml
    portals/jetspeed-2/trunk/installer2/build.xml

Modified: portals/jetspeed-2/trunk/installer2/antinstall-config-full.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer2/antinstall-config-full.xml?view=diff&rev=512960&r1=512959&r2=512960
==============================================================================
--- portals/jetspeed-2/trunk/installer2/antinstall-config-full.xml (original)
+++ portals/jetspeed-2/trunk/installer2/antinstall-config-full.xml Wed Feb 28 12:47:36 2007
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN"
-    "http://antinstaller.sourceforge.net/dtd/antinstall-config-0.7.dtd">
+    "http://antinstaller.sourceforge.net/dtd/antinstall-config-0.8.dtd">
 <!--
 
 This is an example installer from which you can start a project
@@ -94,8 +94,8 @@
 <!--        <text property="dbName" displayText="Database type"
             defaultValue="derby"/>
 -->
-        <text property="dbUser" displayText="Database User Name"/>
-        <text property="dbPassword" displayText="Database Password"/>
+        <text property="dbUser" displayText="Database User Name" defaultValue=""/>
+        <text property="dbPassword" displayText="Database Password" defaultValue=""/>
         
         <text property="jdbcUrl" displayText="JDBC Connection String"
             defaultValue="jdbc:derby:${installDir}/webapps/jetspeed/WEB-INF/productiondb;create=true"/>

Modified: portals/jetspeed-2/trunk/installer2/antinstall-config-min.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer2/antinstall-config-min.xml?view=diff&rev=512960&r1=512959&r2=512960
==============================================================================
--- portals/jetspeed-2/trunk/installer2/antinstall-config-min.xml (original)
+++ portals/jetspeed-2/trunk/installer2/antinstall-config-min.xml Wed Feb 28 12:47:36 2007
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN"
-    "http://antinstaller.sourceforge.net/dtd/antinstall-config-0.7.dtd">
+    "http://antinstaller.sourceforge.net/dtd/antinstall-config-0.8.dtd">
 <!--
 
 This is an example installer from which you can start a project
@@ -53,14 +53,14 @@
             force="true"/>
         <target displayText="Create Database" target="generateDb"
             defaultValue="true" force="true"/>
+        <target displayText="MinInstall"
+            target="MinInstall" defaultValue="true" force="true"/>
         <target displayText="Populate Database" target="populateDB"
             defaultValue="true" force="true"/>
         <target displayText="Layout Portlets" target="layoutPortlets"
             defaultValue="true" force="true"/>
         <target displayText="Portal Administration Portlets"
             target="j2admin" defaultValue="true" force="true"/>
-        <target displayText="MinInstall"
-            target="MinInstall" defaultValue="true" force="true"/>
     </page>
     
     <!--  These are some other input types       -->
@@ -82,8 +82,8 @@
 <!--        <text property="dbName" displayText="Database type"
             defaultValue="derby"/>
 -->
-        <text property="dbUser" displayText="Database User Name"/>
-        <text property="dbPassword" displayText="Database Password"/>
+        <text property="dbUser" displayText="Database User Name" defaultValue=""/>
+        <text property="dbPassword" displayText="Database Password" defaultValue=""/>
         
         <text property="jdbcUrl" displayText="JDBC Connection String"
             defaultValue="jdbc:derby:${installDir}/webapps/jetspeed/WEB-INF/productiondb;create=true"/>
@@ -95,6 +95,7 @@
             defaultValueWin="${installDir}/shared/lib/derby-10.1.1.0.jar"
             displayText="JDBC driver" checkExists="false"/>
         
+        <hidden property="dataFileDirectory" value="database/min"/> 
     </page> 
     <!--  page type="progress" shows a progress page with the install button 
     

Modified: portals/jetspeed-2/trunk/installer2/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer2/build.xml?view=diff&rev=512960&r1=512959&r2=512960
==============================================================================
--- portals/jetspeed-2/trunk/installer2/build.xml (original)
+++ portals/jetspeed-2/trunk/installer2/build.xml Wed Feb 28 12:47:36 2007
@@ -19,7 +19,9 @@
     		<equals arg1="${dbName}" arg2="derby"/> 
     	</condition>
 	
-   	<property name="DATAFILE" value="${basedir}/database/j2-seed.xml"/>		
+    <property name="dataFileDirectory" value="database"/>
+
+    <property name="DATAFILE" value="${basedir}/${dataFileDirectory}/j2-seed.xml"/>
	
     	
     <echo>install unpack done</echo>
         
@@ -54,8 +56,9 @@
 
 	   <target name="MinInstall">
 	  		
-	   		<property name="DATAFILE" value="${basedir}/database/min/j2-seed.xml"/>		
-			<echo>resetting DATAFILE for seed data to ${DATAFILE}</echo>
+<!--	   		<property name="DATAFILE" value="${basedir}/database/min/j2-seed.xml"/>
	 -->
+ 			<echo>resetting DATAFILE for seed data to ${DATAFILE}</echo>
+			<echo>resetting dataFileDirectory for seed data to ${dataFileDirectory}</echo>
 	 	   	
 		</target>
 	



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message