You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2007/08/24 22:20:59 UTC
svn commit: r569510 - in
/portals/jetspeed-2/branches/JETSPEED-2.1.3/installer:
etc/ant-installer/antinstall-config-demo.xml
etc/ant-installer/antinstall-config.xml maven.xml
Author: taylor
Date: Fri Aug 24 13:20:59 2007
New Revision: 569510
URL: http://svn.apache.org/viewvc?rev=569510&view=rev
Log:
upgrade installer to Tomcat 5.2.3
not doing this for trunk since we will need a maven2 solution i assume anyway the maven.xml is missing from there
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/ant-installer/antinstall-config-demo.xml
portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/ant-installer/antinstall-config.xml
portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/maven.xml
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/ant-installer/antinstall-config-demo.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/ant-installer/antinstall-config-demo.xml?rev=569510&r1=569509&r2=569510&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/ant-installer/antinstall-config-demo.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/ant-installer/antinstall-config-demo.xml Fri Aug 24 13:20:59 2007
@@ -42,7 +42,7 @@
<page type="input" name="requiredComponents" displayText="Components selection">
<comment displayText="Jetspeed Enterprise Portal version 2.1.3-dev" bold="true" />
- <target displayText="Tomcat 5.5.20 Webserver" target="install" defaultValue="true" force="true" />
+ <target displayText="Tomcat 5.5.23 Webserver" target="install" defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Portal" property="dummy" defaultValue="true" force="true" />
<checkbox displayText="Layout Portlets" property="dummy" defaultValue="true" force="true" />
<checkbox displayText="Portal Administration Portlets" property="dummy" defaultValue="true" force="true" />
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/ant-installer/antinstall-config.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/ant-installer/antinstall-config.xml?rev=569510&r1=569509&r2=569510&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/ant-installer/antinstall-config.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/etc/ant-installer/antinstall-config.xml Fri Aug 24 13:20:59 2007
@@ -44,7 +44,7 @@
<page type="input" name="requiredComponents" displayText="Components selection">
<comment displayText="Jetspeed Enterprise Portal version 2.1.3-dev" bold="true" />
- <target displayText="Tomcat 5.5.20 Webserver" target="install" defaultValue="true" force="true" />
+ <target displayText="Tomcat 5.5.23 Webserver" target="install" defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Portal" property="dummy" defaultValue="true" force="true" />
<checkbox displayText="Layout Portlets" property="dummy" defaultValue="true" force="true" />
<checkbox displayText="Portal Administration Portlets" property="dummy" defaultValue="true" force="true" />
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/maven.xml?rev=569510&r1=569509&r2=569510&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/maven.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/installer/maven.xml Fri Aug 24 13:20:59 2007
@@ -39,13 +39,15 @@
<mkdir dir="${basedir}/resources" />
- <get usetimestamp="true" dest="${basedir}/resources/tomcat-5.5.20.zip"
- src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20.zip" />
- <get usetimestamp="true" dest="${basedir}/resources/tomcat-5.5.20-compat.zip"
- src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20-compat.zip" />
-
- <unzip src="${basedir}/resources/tomcat-5.5.20.zip" dest="${maven.build.dir}/tomcat" />
- <unzip src="${basedir}/resources/tomcat-5.5.20-compat.zip" dest="${maven.build.dir}/tomcat-compat" />
+ <!--
+ <get usetimestamp="true" dest="${basedir}/resources/tomcat-5.5.23.zip"
+ src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.23.zip" />
+ <get usetimestamp="true" dest="${basedir}/resources/tomcat-5.5.23-compat.zip"
+ src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.23-compat.zip" />
+-->
+
+ <unzip src="${basedir}/resources/tomcat-5.5.23.zip" dest="${maven.build.dir}/tomcat" />
+ <unzip src="${basedir}/resources/tomcat-5.5.23-compat.zip" dest="${maven.build.dir}/tomcat-compat" />
<delete dir="${maven.build.dir}/tomcat/webapps" />
@@ -206,5 +208,23 @@
<j:set var="build_type" value="demo" />
<attainGoal name="buildInstaller" />
</goal>
+
+ <goal name='unzip'>
+ <unzip src="${basedir}/resources/tomcat-5.5.23.zip" dest="resources/tomcat-5.5.23/" />
+ </goal>
+ <goal name='zip'>
+ <zip file="resources/tomcat-5.5.23.zip">
+ <zipfileset dir="resources/tomcat-5.5.23" />
+ </zip>
+ </goal>
+
+ <goal name='unzipcompat'>
+ <unzip src="${basedir}/resources/tomcat-5.5.23-compat.zip" dest="resources/tomcat-5.5.23-compat" />
+ </goal>
+ <goal name='zipcompat'>
+ <zip file="resources/tomcat-5.5.23-compat.zip">
+ <zipfileset dir="resources/tomcat-5.5.23-compat" />
+ </zip>
+ </goal>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org