portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r355593 - in /portals/jetspeed-2/trunk/installer2: antinstall-config-multi.xml build.xml
Date Fri, 09 Dec 2005 20:38:40 GMT
Author: taylor
Date: Fri Dec  9 12:38:37 2005
New Revision: 355593

URL: http://svn.apache.org/viewcvs?rev=355593&view=rev
Log:
patches from Chris Schaefer to improve the installer

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

Modified: portals/jetspeed-2/trunk/installer2/antinstall-config-multi.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/installer2/antinstall-config-multi.xml?rev=355593&r1=355592&r2=355593&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/installer2/antinstall-config-multi.xml (original)
+++ portals/jetspeed-2/trunk/installer2/antinstall-config-multi.xml Fri Dec  9 12:38:37 2005
@@ -82,10 +82,20 @@
     <page type="input" name="databaseInfo" displayText="Database information">
         
         <comment
-            displayText="Please fill in the fields below with the approriate database information.
The default values should work"/>
-        
-        <text property="dbName" displayText="Database type"
+            displayText="Please fill in the fields below with the approriate database information."/>
+        <comment  displayText=" The default values should install Apache Derby as the
Database."/>
+        <large-select property="dbName" displayText="Database type" defaultValue="derby"
>
+           <option text="derby"  value="derby" />
+           <option text="mysql"  value="mysql" />
+           <option text="hsql"  value="hsql" />
+           <option text="postgres"  value="postgres" />
+           <option text="sapdb"  value="sapdb" />
+           <option text="oracle"  value="oracle" />
+           <option text="mssql"  value="mssql" />
+        </large-select> 
+<!--        <text property="dbName" displayText="Database type"
             defaultValue="derby"/>
+-->
         <text property="dbUser" displayText="Database User Name"/>
         <text property="dbPassword" displayText="Database Password"/>
         

Modified: portals/jetspeed-2/trunk/installer2/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/installer2/build.xml?rev=355593&r1=355592&r2=355593&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/installer2/build.xml (original)
+++ portals/jetspeed-2/trunk/installer2/build.xml Fri Dec  9 12:38:37 2005
@@ -14,78 +14,78 @@
         <mkdir dir="${basedir}/temp"/>
         <unzip src="installpack.zip" dest="${basedir}/temp"/>
 	<echo>install unpack done</echo>
-        
-	<echo> moving stuff from the temp dir </echo>
+        
+	<echo> moving stuff from the temp dir </echo>
 	<echo>now configuring</echo>
         <copy todir="${installDir}" overwrite="true">
             <fileset dir="${basedir}/temp">
                 <exclude name="**/jetspeed.xml"/>
             </fileset>
         </copy>
-
-	<echo>unpacking jetspeed war</echo>	
-        <unwar src="${installDir}/webapps/jetspeed.war" dest="${installDir}/webapps/jetspeed"
/>
-        <copy file="temp/jetspeed-tomcat-5.5.xml"
-          tofile="${installDir}/conf/Catalina/localhost/jetspeed.xml" overwrite="true">
-          <filterset begintoken="@" endtoken="@">
-            <filter token="CONTEXT" value="jetspeed"/>
-            <filter token="USERNAME" value="${dbUser}"/>
-            <filter token="PASSWORD" value="${dbPassword}"/>
-            <filter token="DRIVER" value="${jdbcDriverClass}"/>
-            <filter token="URL" value="${jdbcUrl}"/>
-          </filterset>
-        </copy>
-	
+
+	<echo>unpacking jetspeed war</echo>	
+        <unwar src="${installDir}/webapps/jetspeed.war" dest="${installDir}/webapps/jetspeed"
/>
+        <copy file="temp/jetspeed-tomcat-5.5.xml"
+          tofile="${installDir}/conf/Catalina/localhost/jetspeed.xml" overwrite="true">
+          <filterset begintoken="@" endtoken="@">
+            <filter token="CONTEXT" value="jetspeed"/>
+            <filter token="USERNAME" value="${dbUser}"/>
+            <filter token="PASSWORD" value="${dbPassword}"/>
+            <filter token="DRIVER" value="${jdbcDriverClass}"/>
+            <filter token="URL" value="${jdbcUrl}"/>
+          </filterset>
+        </copy>
+	
 	<echo>copying database driver jar</echo>
 	<!-- place db jar in shared.. we assume the Catalina will not need to talk to this -->
     	<copy failonerror="false" file="${jdbcDriverJar}" todir="${installDir}/shared/lib"
overwrite="true" />
-	<echo>fixing permissions</echo>
-	<chmod perm="700" dir="${installDir}/bin" includes="**/*.sh"/>
+	<echo>fixing permissions</echo>
+	<chmod perm="700" dir="${installDir}/bin" includes="**/*.sh"/>
 	<echo>basic install finished</echo>
     </target>    
 	
-    <target name="generateDb">
-        <echo>starting Db generation</echo>
-        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-            password="${dbPassword}"
-            src="${basedir}/database/${dbName}/schema/phase1-schema.sql"
-            print="yes" output="outputfile.txt">
-            <classpath>
-                <pathelement location="${jdbcDriverJar}"/>
-            </classpath>
-        </sql>
-        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-            password="${dbPassword}"
-            src="${basedir}/database/${dbName}/schema/phase2-schema.sql"
-            print="yes" output="outputfile.txt">
-            <classpath>
-                <pathelement location="${jdbcDriverJar}"/>
-            </classpath>
-        </sql>
-        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-            password="${dbPassword}"
-            src="${basedir}/database/${dbName}/schema/phase3ojb-schema.sql"
-            print="yes" output="outputfile.txt">
-            <classpath>
-                <pathelement location="${jdbcDriverJar}"/>
-            </classpath>
-        </sql>
-        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-            password="${dbPassword}"
-            src="${basedir}/database/${dbName}/schema/prefs-schema.sql"
-            print="yes" output="outputfile.txt">
-            <classpath>
-                <pathelement location="${jdbcDriverJar}"/>
-            </classpath>
-        </sql>
-        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-            password="${dbPassword}"
-            src="${basedir}/database/${dbName}/schema/registry-schema.sql"
-            print="yes" output="outputfile.txt">
-            <classpath>
-                <pathelement location="${jdbcDriverJar}"/>
-            </classpath>
-        </sql>
+    <target name="generateDb">
+        <echo>starting Db generation</echo>
+        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
+            password="${dbPassword}"
+            src="${basedir}/database/${dbName}/schema/phase1-schema.sql"
+            print="yes" output="outputfile.txt">
+            <classpath>
+                <pathelement location="${jdbcDriverJar}"/>
+            </classpath>
+        </sql>
+        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
+            password="${dbPassword}"
+            src="${basedir}/database/${dbName}/schema/phase2-schema.sql"
+            print="yes" output="outputfile.txt">
+            <classpath>
+                <pathelement location="${jdbcDriverJar}"/>
+            </classpath>
+        </sql>
+        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
+            password="${dbPassword}"
+            src="${basedir}/database/${dbName}/schema/phase3ojb-schema.sql"
+            print="yes" output="outputfile.txt">
+            <classpath>
+                <pathelement location="${jdbcDriverJar}"/>
+            </classpath>
+        </sql>
+        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
+            password="${dbPassword}"
+            src="${basedir}/database/${dbName}/schema/prefs-schema.sql"
+            print="yes" output="outputfile.txt">
+            <classpath>
+                <pathelement location="${jdbcDriverJar}"/>
+            </classpath>
+        </sql>
+        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
+            password="${dbPassword}"
+            src="${basedir}/database/${dbName}/schema/registry-schema.sql"
+            print="yes" output="outputfile.txt">
+            <classpath>
+                <pathelement location="${jdbcDriverJar}"/>
+            </classpath>
+        </sql>
         <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
             password="${dbPassword}"
             src="${basedir}/database/${dbName}/schema/security-schema.sql"
@@ -94,23 +94,23 @@
                 <pathelement location="${jdbcDriverJar}"/>
             </classpath>
         </sql>
-        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-            password="${dbPassword}"
-            src="${basedir}/database/populate-userinfo-for-default-psml.sql"
-            print="yes" output="outputfile.txt">
-            <classpath>
-                <pathelement location="${jdbcDriverJar}"/>
-            </classpath>
-        </sql>
-        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-            password="${dbPassword}"
-            src="${basedir}/database/populate-db-default.sql" print="yes"
-            output="outputfile.txt">
-            <classpath>
-                <pathelement location="${jdbcDriverJar}"/>
-            </classpath>
-        </sql>
-        <echo>DB generation done!</echo>
+        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
+            password="${dbPassword}"
+            src="${basedir}/database/populate-userinfo-for-default-psml.sql"
+            print="yes" output="outputfile.txt">
+            <classpath>
+                <pathelement location="${jdbcDriverJar}"/>
+            </classpath>
+        </sql>
+        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
+            password="${dbPassword}"
+            src="${basedir}/database/populate-db-default.sql" print="yes"
+            output="outputfile.txt">
+            <classpath>
+                <pathelement location="${jdbcDriverJar}"/>
+            </classpath>
+        </sql>
+        <echo>DB generation done!</echo>
     </target>
     
 	<target name="layoutPortlets">
@@ -121,6 +121,7 @@
     </target>
 	<target name="j2admin">
 			<copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy" file="${basedir}/portlet_apps/j2-admin.war"
/>		   
+                        <delete file="${installDir}/webapps/jetspeed/WEB-INF/deploy/zipsucks"
/>
 	</target>
 	<target name="jpetstorePortlets">
 			<copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy" file="${basedir}/portlet_apps/jpetstore.war"
/>		   



---------------------------------------------------------------------
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