Author: ate
Date: Thu Apr 8 15:57:46 2010
New Revision: 931984
URL: http://svn.apache.org/viewvc?rev=931984&view=rev
Log:
Reverting commit r931932 as some unnamed person turned out to have way too much
problems with the resulting Tomcat SEVERE error messages logged against
potential problems within our code
Removed:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/logging.properties
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml?rev=931984&r1=931983&r2=931984&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
Thu Apr 8 15:57:46 2010
@@ -96,7 +96,7 @@
<page type="input" name="requiredComponents" displayText="Components
selection, (Demo)" ifProperty="(${operation}=install) AND
(${installationType}=demo)">
<hidden property="setupDBAntTarget" value="runSetupNoDB" />
<comment displayText="Jetspeed Enterprise Portal version 2.2.1-SNAPSHOT,
(Demo)" bold="true" />
- <target displayText="Tomcat 6.0.26 Webserver" target="install"
defaultValue="true" force="true" />
+ <target displayText="Tomcat 6.0.18 Webserver" target="install"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Portal" property="dummy"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Layout Portlets" property="dummy"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Administration Portlets" property="dummy"
defaultValue="true" force="true" />
@@ -110,7 +110,7 @@
<page type="input" name="requiredComponents" displayText="Components
selection, (Minimal)" ifProperty="(${operation}=install) AND
(${installationType}=minimal)">
<hidden property="setupDBAntTarget" value="runSetupNoDB" />
<comment displayText="Jetspeed Enterprise Portal version 2.2.1-SNAPSHOT"
bold="true" />
- <target displayText="Tomcat 6.0.26 Webserver" target="install"
defaultValue="true" force="true" />
+ <target displayText="Tomcat 6.0.18 Webserver" target="install"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Portal" property="dummy"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Layout Portlets" property="dummy"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Administration Portlets" property="dummy"
defaultValue="true" force="true" />
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml?rev=931984&r1=931983&r2=931984&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
Thu Apr 8 15:57:46 2010
@@ -39,7 +39,7 @@
<properties>
<tomcat.version.major>6</tomcat.version.major>
- <tomcat.version.minor>6.0.26</tomcat.version.minor>
+ <tomcat.version.minor>6.0.18</tomcat.version.minor>
<tomcat.name>apache-tomcat-${tomcat.version.minor}</tomcat.name>
<org.apache.portals.jetspeed.version>${pom.version}</org.apache.portals.jetspeed.version>
<org.apache.jetspeed.portal.context.name>jetspeed</org.apache.jetspeed.portal.context.name>
@@ -81,7 +81,6 @@
<delete
file="${org.apache.jetspeed.portal.home}/bin/catalina.sh"/>
<delete
file="${org.apache.jetspeed.portal.home}/conf/context.xml"/>
<delete
file="${org.apache.jetspeed.portal.home}/conf/server.xml"/>
- <delete
file="${org.apache.jetspeed.portal.home}/conf/logging.properties"/>
<delete
file="${org.apache.jetspeed.portal.home}/conf/tomcat-users.xml"/>
<delete
dir="${org.apache.jetspeed.portal.home}/webapps/examples"/>
<delete
dir="${org.apache.jetspeed.portal.home}/webapps/docs"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
