portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r496599 - in /portals/jetspeed-2/trunk: installer2/antinstall-config-derby.xml installer2/antinstall-config-multi.xml installer2/build-installer.xml maven-plugin/plugin.jelly
Date Tue, 16 Jan 2007 05:47:32 GMT
Author: taylor
Date: Mon Jan 15 21:47:31 2007
New Revision: 496599

URL: http://svn.apache.org/viewvc?view=rev&rev=496599
Log:
update installer to create a PRE RELEASE version of 2.1
this is not an official release, so it cannot be housed at Apache (AFAIK)
I will make an unofficial prerelease of 2.1 available once per week until 
the final release on February 28, 2007 -- from 

http://www.bluesunrise.com/maven/org.apache.jetspeed-2/dist/

note these pre-releases will only be for Java 1.5, not 1.4

Modified:
    portals/jetspeed-2/trunk/installer2/antinstall-config-derby.xml
    portals/jetspeed-2/trunk/installer2/antinstall-config-multi.xml
    portals/jetspeed-2/trunk/installer2/build-installer.xml
    portals/jetspeed-2/trunk/maven-plugin/plugin.jelly

Modified: portals/jetspeed-2/trunk/installer2/antinstall-config-derby.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer2/antinstall-config-derby.xml?view=diff&rev=496599&r1=496598&r2=496599
==============================================================================
--- portals/jetspeed-2/trunk/installer2/antinstall-config-derby.xml (original)
+++ portals/jetspeed-2/trunk/installer2/antinstall-config-derby.xml Mon Jan 15 21:47:31 2007
@@ -28,13 +28,13 @@
 -->
 <installer ui="swing,text" verbose="false"
     lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
-    name="Jetspeed 2.0 Installer" windowIcon="/resources/feather-small.png"
+    name="Jetspeed 2.1 Installer" windowIcon="/resources/feather-small.png"
     defaultImageResource="/resources/apache-portals.gif" minJavaVersion="1.4">
     <!--  each page element represents a page of the installer -->
-    <page type="input" name="intro" displayText="Jetspeed 2.0">
-        <comment displayText="Welcome to Jetspeed 2.0!" title="true"/>
+    <page type="input" name="intro" displayText="Jetspeed 2.1 (Pre-release)">
+        <comment displayText="Welcome to Jetspeed 2.1 (Pre-release)!" title="true"/>
         <comment
-            displayText="This installer program will guide you through an install of Jetspeed
2.0 Portal."/>
+            displayText="This installer program will guide you through an install of Jetspeed
2.1 Portal."/>
     </page>
     <!--  type="license" shows a license page to click through -->
     <page type="license" name="license" displayText="License conditions"
@@ -43,8 +43,8 @@
     <!--  type="input" shows a list of editable options for the installer -->
     <page type="input" name="properties" displayText="Required install options">
         <directory property="installDir" 
-            defaultValue="/usr/local/ApacheJetspeed2.0"
-            defaultValueWin="${env.ProgramFiles}\Apache Jetspeed 2.0"
+            defaultValue="/usr/local/ApacheJetspeed-2.1-prerelease"
+            defaultValueWin="c:/ApacheJetspeed-2.1-prerelease"
             displayText="Select an installation directory" create="true"/>
     </page>
     <page type="input" name="requiredComponents" displayText="Required Components">

Modified: portals/jetspeed-2/trunk/installer2/antinstall-config-multi.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer2/antinstall-config-multi.xml?view=diff&rev=496599&r1=496598&r2=496599
==============================================================================
--- portals/jetspeed-2/trunk/installer2/antinstall-config-multi.xml (original)
+++ portals/jetspeed-2/trunk/installer2/antinstall-config-multi.xml Mon Jan 15 21:47:31 2007
@@ -28,13 +28,13 @@
 -->
 <installer ui="swing,text" verbose="false"
     lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
-    name="Jetspeed 2.0 Installer" windowIcon="/resources/feather-small.png"
+    name="Jetspeed 2.1 Installer" windowIcon="/resources/feather-small.png"
     defaultImageResource="/resources/apache-portals.gif" minJavaVersion="1.4">
     <!--  each page element represents a page of the installer -->
-    <page type="input" name="intro" displayText="Jetspeed 2.0">
-        <comment displayText="Welcome to Jetspeed 2.0!" title="true"/>
+    <page type="input" name="intro" displayText="Jetspeed 2.1 (Pre-release)">
+        <comment displayText="Welcome to Jetspeed 2.1 (Pre-release)!" title="true"/>
         <comment
-            displayText="This installer program will guide you through an install of Jetspeed
2.0 Portal."/>
+            displayText="This installer program will guide you through an install of Jetspeed
2.1 Portal."/>
     </page>
     <!--  type="license" shows a license page to click through -->
     <page type="license" name="license" displayText="License conditions"
@@ -43,8 +43,8 @@
     <!--  type="input" shows a list of editable options for the installer -->
     <page type="input" name="properties" displayText="Required install options">
         <directory property="installDir" 
-            defaultValue="/usr/local/ApacheJetspeed2.0"
-            defaultValueWin="${env.ProgramFiles}\Apache Jetspeed 2.0"
+            defaultValue="/usr/local/ApacheJetspeed-2.1-prerelease"
+            defaultValueWin="c:/ApacheJetspeed-2.1-prerelease"
             displayText="Select an installation directory" create="true"/>
     </page>
     <page type="input" name="requiredComponents" displayText="Required Components">

Modified: portals/jetspeed-2/trunk/installer2/build-installer.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer2/build-installer.xml?view=diff&rev=496599&r1=496598&r2=496599
==============================================================================
--- portals/jetspeed-2/trunk/installer2/build-installer.xml (original)
+++ portals/jetspeed-2/trunk/installer2/build-installer.xml Mon Jan 15 21:47:31 2007
@@ -7,7 +7,7 @@
 
 -->
 
-<project name="Create Jetspeed 2.0 Installer Zip Build"  default="selfextract"  basedir=".">
+<project name="Create Jetspeed 2.1 Installer Zip Build"  default="selfextract"  basedir=".">
 <target name="selfextract" depends="clean,copystuff,buildZipPack">
 
 	<copy todir="./selfextract">
@@ -32,7 +32,7 @@
 	<copy todir="./selfextract/database">
 		<fileset dir="database"/>			
 	</copy>
-	<echo message="Building Jetspeed 2.0 SELFEXTRACT"/>
+	<echo message="Building Jetspeed 2.1 SELFEXTRACT"/>
 	<jar  file="./${install.name}-install.jar" compress="true">
 		<manifest>
 			<attribute name="Manifest-Version" value="1.0"/>
@@ -53,19 +53,19 @@
   <!-- get the base tomcat install -->
   <!-- first download the zip files -->
   <echo> now downloading tomcat installs..  this may take a while </echo>
-  <get usetimestamp="true" dest="./apache-tomcat-5.5.12.zip" src="http://www.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12.zip"
/>
-  <get usetimestamp="true" dest="./apache-tomcat-5.5.12-compat.zip" src="http://www.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12-compat.zip"
/>
+  <get usetimestamp="true" dest="./tomcat-5.5.20.zip" src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20.zip"
/>
<!-- TODO: renable for Java 1.4 support
+  <get usetimestamp="true" dest="./tomcat-5.5.20-compat.zip" src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20.zip"
/>
  -->
   <!-- now unzip them -->
   <echo> done with downloads, now unzipping </echo>
-  <unzip src="./apache-tomcat-5.5.12.zip" dest="./apache-tomcat" />
-  <unzip src="./apache-tomcat-5.5.12-compat.zip" dest="./apache-tomcat-compat" />
+  <unzip src="./tomcat-5.5.20.zip" dest="./tomcat-5.5.20" />
<!--
+  <unzip src="./tomcat-5.5.20-compat.zip" dest="./tomcat-compat-5.5.20" />
 -->
   <copy todir="Jetspeed_Portal" >
-      <fileset dir="apache-tomcat/apache-tomcat-5.5.12" >
+      <fileset dir="tomcat-5.5.20" >
 	   <include name="**/*" />
-	</fileset>
-      <fileset dir="apache-tomcat-compat/apache-tomcat-5.5.12" >
+	</fileset>
<!--
+   <fileset dir="tomcat-5.5.20" >
 	  <include name="**/*" />	
-	</fileset>
+	</fileset>
-->
   </copy>
   <echo> updating tomcat users </echo>
   <copy file="tomcat-users.xml" tofile="Jetspeed_Portal/conf/tomcat-users.xml" overwrite="true"
/>

  <echo> replacing startup files with ones with larger heap size </echo>
 <copy file="catalina.sh" tofile="Jetspeed_Portal/bin/catalina.sh" overwrite="true" />
 <copy file="catalina.bat" tofile="Jetspeed_Portal/bin/catalina.bat" overwrite="true" />

@@ -87,20 +87,20 @@
   <!-- setup the shared/lib dir with stuff -->
     <copy todir="Jetspeed_Portal/shared/lib" >
        <fileset dir="${maven.repo.local}/org.apache.pluto/jars/" >
-            <include name="**/pluto*.jar" />
+            <include name="pluto-${pluto.version}.jar" />
        </fileset>
        <fileset dir="${maven.repo.local}/${bridges.groupId}/jars/" >
-            <include name="**/portals-bridges-common-*.jar" />
+            <include name="portals-bridges-common-${portals.bridges.common.version}.jar"
/>
        </fileset>
        <fileset dir="${maven.repo.local}/org.apache.derby/jars/" >
-            <include name="**/derby-*.jar" />
+            <include name="derby-${derby.version}.jar" />
        </fileset>
        <fileset dir="${maven.repo.local}/${org.apache.jetspeed.portal.groupId}/jars/"
>
-            <include name="**/jetspeed-commons-*.jar" />
-            <include name="**/jetspeed-api-*.jar" />
+            <include name="jetspeed-commons-${jetspeed.version}.jar" />
+            <include name="jetspeed-api-${jetspeed.version}.jar" />
        </fileset>
        <fileset dir="${maven.repo.local}/portlet-api/jars/" >
-            <include name="**/portlet-api-*.jar" />
+            <include name="portlet-api-${portlet.api.version}.jar" />
        </fileset>
     </copy>   
  
@@ -183,18 +183,18 @@
 		</zip>
 	</target>
         <target name="cleanDLs" >
-             <delete file="./apache-tomcat-5.5.12.zip" failonerror="false" />
-             <delete file="./apache-tomcat-5.5.12-compat.zip" failonerror="false" />
+             <delete file="./tomcat-5.5.20.zip" failonerror="false" />
+             <delete file="./tomcat-5.5.20-compat.zip" failonerror="false" />
         </target>
 	<target name="clean">
              <delete dir="Jetspeed_Portal" failonerror="false" />
              <delete dir="temp" failonerror="false" />
 	     <delete file="installpack.zip" failonerror="false" />
-             <delete file="Jetspeed2.0-install.jar" failonerror="false" />
-             <delete file="Jetspeed2.0-MultiDB-install.jar" failonerror="false" />

-             <delete file="Jetspeed2.0-derby-install.jar" failonerror="false" /> 
-             <delete dir="apache-tomcat" failonerror="false" />
-             <delete dir="apache-tomcat-compat" failonerror="false" />
+             <delete file="Jetspeed2.1-install.jar" failonerror="false" />
+             <delete file="Jetspeed2.1-MultiDB-install.jar" failonerror="false" />

+             <delete file="Jetspeed2.1-derby-install.jar" failonerror="false" /> 
+             <delete dir="tomcat" failonerror="false" />
+             <delete dir="tomcat-compat" failonerror="false" />
              <delete dir="selfextract" failonerror="false" />
              <delete dir="database" failonerror="false" />
              <delete dir="portlet_apps" failonerror="false" />

Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?view=diff&rev=496599&r1=496598&r2=496599
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Mon Jan 15 21:47:31 2007
@@ -1034,14 +1034,14 @@
   </goal>
 
   <goal name="j2:buildDerbyInstaller">
-    <ant:property name="install.name" value="Jetspeed2.0-derby" /> 
+    <ant:property name="install.name" value="Jetspeed2.1-derby" /> 
     <ant:copy file="${basedir}/installer2/antinstall-config-derby.xml" tofile="${basedir}/installer2/antinstall-config.xml"
overwrite="true" />
     <ant:ant dir="${basedir}/installer2" antfile="build-installer.xml" target="selfextract"
/>
   </goal> 
  
   <goal name="j2:buildMultiInstaller">
     <attainGoal name="j2:buildMultiDbSQL" />
-    <ant:property name="install.name" value="Jetspeed2.0-MultiDB" />
+    <ant:property name="install.name" value="Jetspeed2.1-MultiDB" />
     <ant:copy file="${basedir}/installer2/antinstall-config-multi.xml" tofile="${basedir}/installer2/antinstall-config.xml"
overwrite="true" />
     <ant:ant dir="${basedir}/installer2" antfile="build-installer.xml" target="selfextract"
/>
   </goal>



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