Author: taylor
Date: Fri Jun 12 23:12:11 2015
New Revision: 1685192
URL: http://svn.apache.org/r1685192
Log:
JS2-1321: fixing broken installer, upgrading embedded Tomcat to latest 7.0.62
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/final-assembly-descriptor.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml
portals/jetspeed-2/portal/trunk/pom.xml
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml?rev=1685192&r1=1685191&r2=1685192&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml
Fri Jun 12 23:12:11 2015
@@ -55,7 +55,7 @@
</activation>
<properties>
-
<org.apache.jetspeed.server.home>/change/this/apache-tomcat-7.0.59/</org.apache.jetspeed.server.home>
+
<org.apache.jetspeed.server.home>/change/this/apache-tomcat-7.0.62/</org.apache.jetspeed.server.home>
<org.apache.jetspeed.catalina.version.major>7</org.apache.jetspeed.catalina.version.major>
<!--
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=1685192&r1=1685191&r2=1685192&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
Fri Jun 12 23:12:11 2015
@@ -90,9 +90,9 @@
<option text="Minimal" value="minimal" />
</select>
<comment displayText="And select the portal pipeline to install." />
- <select property="pipelineType" displayText="Pipeline type"
defaultValue="jetui">
- <option text="JetUI" value="jetui" />
+ <select property="pipelineType" displayText="Pipeline type"
defaultValue="classic">
<option text="Classic" value="classic" />
+ <option text="JetUI" value="jetui" />
</select>
</page>
@@ -100,7 +100,7 @@
ifProperty="(${operation}=install) AND (${installationType}=demo)">
<hidden property="setupDBAntTarget" value="runSetupNoDB" />
<comment displayText="Jetspeed Enterprise Portal version 2.3.0-SNAPSHOT,
(Demo)" bold="true" />
- <target displayText="Tomcat 7.0.53 Webserver" target="install"
defaultValue="true" force="true" />
+ <target displayText="Tomcat 7.0.62 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" />
@@ -115,7 +115,7 @@
ifProperty="(${operation}=install) AND (${installationType}=minimal)">
<hidden property="setupDBAntTarget" value="runSetupNoDB" />
<comment displayText="Jetspeed Enterprise Portal version 2.3.0-SNAPSHOT"
bold="true" />
- <target displayText="Tomcat 7.0.53 Webserver" target="install"
defaultValue="true" force="true" />
+ <target displayText="Tomcat 7.0.62 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/final-assembly-descriptor.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/final-assembly-descriptor.xml?rev=1685192&r1=1685191&r2=1685192&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/final-assembly-descriptor.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/final-assembly-descriptor.xml
Fri Jun 12 23:12:11 2015
@@ -29,9 +29,9 @@
<dependencySet>
<unpack>true</unpack>
<includes>
- <include>jetspeed-ant-tasks*</include>
+ <include>org.apache.portals.jetspeed-2:jetspeed-ant-tasks</include>
</includes>
- <useProjectArtifact>false</useProjectArtifact>
+ <useProjectArtifact>true</useProjectArtifact>
</dependencySet>
</dependencySets>
<fileSets>
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=1685192&r1=1685191&r2=1685192&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
Fri Jun 12 23:12:11 2015
@@ -39,7 +39,7 @@
<properties>
<tomcat.version.major>7</tomcat.version.major>
- <tomcat.version.minor>7.0.53</tomcat.version.minor>
+ <tomcat.version.minor>7.0.62</tomcat.version.minor>
<tomcat.name>apache-tomcat-${tomcat.version.minor}</tomcat.name>
<org.apache.portals.jetspeed.version>${project.version}</org.apache.portals.jetspeed.version>
<org.apache.jetspeed.portal.context.name>jetspeed</org.apache.jetspeed.portal.context.name>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml?rev=1685192&r1=1685191&r2=1685192&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml Fri Jun 12
23:12:11 2015
@@ -74,6 +74,7 @@
<target>
<id>installer</id>
<depends>clean,database,tomcat-portal-unpack,tomcat-portal,tomcat-portal-pack,ant-installer</depends>
+ <!--<depends>database,ant-installer</depends>-->
</target>
</targets>
</configuration>
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=1685192&r1=1685191&r2=1685192&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Fri Jun 12 23:12:11 2015
@@ -278,7 +278,7 @@
<org.apache.portals.bridges.velocity.version>2.1</org.apache.portals.bridges.velocity.version>
<org.apache.portals.bridges.groovy.version>1.0.4</org.apache.portals.bridges.groovy.version>
<org.apache.portals.bridges.portletfilter.version>1.0.4</org.apache.portals.bridges.portletfilter.version>
-
<org.apache.portals.applications.apa-demo.version>1.3-SNAPSHOT</org.apache.portals.applications.apa-demo.version>
+
<org.apache.portals.applications.apa-demo.version>1.3</org.apache.portals.applications.apa-demo.version>
<org.apache.portals.applications.apa-gems.version>1.2</org.apache.portals.applications.apa-gems.version>
<org.apache.portals.applications.apa-logging.version>1.1</org.apache.portals.applications.apa-logging.version>
<org.apache.portals.applications.apa-rss.version>1.3</org.apache.portals.applications.apa-rss.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
