portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1174669 - in /portals/jetspeed-2/portal/trunk: ./ jetspeed-archetype/src/main/resources/archetype-resources/ jetspeed-installer/ jetspeed-installer/etc/ant-installer/ maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/mav...
Date Fri, 23 Sep 2011 11:31:48 GMT
Author: ate
Date: Fri Sep 23 11:31:47 2011
New Revision: 1174669

URL: http://svn.apache.org/viewvc?rev=1174669&view=rev
Log:
JS2-1255: Update Jetspeed demo and installer to use latest Tomcat 6.x version for hardened
security

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/jetspeed-mvn-tomcat-portal-pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-mvn-settings-sample.xml
    portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java

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=1174669&r1=1174668&r2=1174669&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 Sep 23 11:31:47 2011
@@ -55,8 +55,8 @@
       </activation>
       <properties>
         
-        <org.apache.jetspeed.server.home>/change/this/apache-tomcat-7.0.21/</org.apache.jetspeed.server.home>
-        <org.apache.jetspeed.catalina.version.major>7</org.apache.jetspeed.catalina.version.major>
+        <org.apache.jetspeed.server.home>/change/this/apache-tomcat-6.0.33/</org.apache.jetspeed.server.home>
+        <org.apache.jetspeed.catalina.version.major>6</org.apache.jetspeed.catalina.version.major>
         
         <!--
           <org.apache.jetspeed.production.database.default.name>mysql</org.apache.jetspeed.production.database.default.name>

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=1174669&r1=1174668&r2=1174669&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 Sep 23 11:31:47 2011
@@ -100,7 +100,7 @@
     ifProperty="(${operation}=install) AND (${installationType}=demo)">
     <hidden property="setupDBAntTarget" value="runSetupNoDB" />
     <comment displayText="Jetspeed Enterprise Portal version 2.2.2-SNAPSHOT, (Demo)" bold="true"
/>
-    <target displayText="Tomcat 7.0.21 Webserver" target="install" defaultValue="true"
force="true" />
+    <target displayText="Tomcat 6.0.33 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.2.2-SNAPSHOT" bold="true"
/>
-    <target displayText="Tomcat 7.0.21 Webserver" target="install" defaultValue="true"
force="true" />
+    <target displayText="Tomcat 6.0.33 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=1174669&r1=1174668&r2=1174669&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 Sep 23 11:31:47 2011
@@ -38,8 +38,8 @@
   <packaging>pom</packaging>
 
   <properties>
-    <tomcat.version.major>7</tomcat.version.major>
-    <tomcat.version.minor>7.0.21</tomcat.version.minor>
+    <tomcat.version.major>6</tomcat.version.major>
+    <tomcat.version.minor>6.0.33</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-mvn-settings-sample.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-mvn-settings-sample.xml?rev=1174669&r1=1174668&r2=1174669&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-mvn-settings-sample.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-mvn-settings-sample.xml Fri Sep 23 11:31:47 2011
@@ -54,7 +54,7 @@
       <properties>
 
         <org.apache.jetspeed.server.home>@rootdir@/applications/jetspeed-demo/target/demo-deploy</org.apache.jetspeed.server.home>
-        <org.apache.jetspeed.catalina.version.major>7</org.apache.jetspeed.catalina.version.major>
+        <org.apache.jetspeed.catalina.version.major>6</org.apache.jetspeed.catalina.version.major>
 
         <!-- demo embedded Derby database configurations -->
         

Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java?rev=1174669&r1=1174668&r2=1174669&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
Fri Sep 23 11:31:47 2011
@@ -77,7 +77,7 @@ public class DeployMojo extends Abstract
     private static final String PROFILE_TOMCAT_NULL = "tomcatnull";
     private static final String PROFILE_TOMCAT6 = "tomcat6";
     private static final String PROFILE_TOMCAT7 = "tomcat7";
-    private static final String DEFAULT_PROFILE = PROFILE_TOMCAT7; 
+    private static final String DEFAULT_PROFILE = PROFILE_TOMCAT6; 
 
     public static class Deployment
     {



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