Scarab commit: svn commit: r11215 - trunk: . src/webapp/WEB-INF tomcat tomcat/bin tomcat/common tomcat/conf tomcat/conf/Catalina tomcat/conf/Catalina/localhost tomcat/lib tomcat/logs tomcat/server tomcat/temp tomcat/webapps tomcat/work

[email protected] Fri, 4 May 2012 01:02:04 -0700 (PDT)
Newsgroups	gmane.comp.java.scarab.cvs
Message-ID	<[email protected]>
Author: mcoss
Date: 2012-05-04 01:02:04-0700
New Revision: 11215

Added:
   trunk/tomcat/LICENSE
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/LICENSE
   trunk/tomcat/NOTICE
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/NOTICE
   trunk/tomcat/RELEASE-NOTES
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/RELEASE-NOTES
   trunk/tomcat/RUNNING.txt
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/RUNNING.txt
   trunk/tomcat/lib/
      - copied from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/
   trunk/tomcat/work/
      - copied from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/work/
Replaced:
   trunk/tomcat/bin/
      - copied from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/
   trunk/tomcat/bin/bootstrap.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/bootstrap.jar
   trunk/tomcat/bin/catalina-tasks.xml
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/catalina-tasks.xml
   trunk/tomcat/bin/catalina.bat
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/catalina.bat
   trunk/tomcat/bin/catalina.sh
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/catalina.sh
   trunk/tomcat/bin/commons-daemon-native.tar.gz
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/commons-daemon-native.tar.gz
   trunk/tomcat/bin/commons-daemon.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/commons-daemon.jar
   trunk/tomcat/bin/configtest.bat
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/configtest.bat
   trunk/tomcat/bin/configtest.sh
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/configtest.sh
   trunk/tomcat/bin/cpappend.bat
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/cpappend.bat
   trunk/tomcat/bin/daemon.sh
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/daemon.sh
   trunk/tomcat/bin/digest.bat
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/digest.bat
   trunk/tomcat/bin/digest.sh
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/digest.sh
   trunk/tomcat/bin/setclasspath.bat
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/setclasspath.bat
   trunk/tomcat/bin/setclasspath.sh
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/setclasspath.sh
   trunk/tomcat/bin/shutdown.bat
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/shutdown.bat
   trunk/tomcat/bin/shutdown.sh
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/shutdown.sh
   trunk/tomcat/bin/startup.bat
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/startup.bat
   trunk/tomcat/bin/startup.sh
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/startup.sh
   trunk/tomcat/bin/tomcat-juli.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/tomcat-juli.jar
   trunk/tomcat/bin/tomcat-native.tar.gz
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/tomcat-native.tar.gz
   trunk/tomcat/bin/tool-wrapper.bat
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/tool-wrapper.bat
   trunk/tomcat/bin/tool-wrapper.sh
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/tool-wrapper.sh
   trunk/tomcat/bin/version.bat
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/version.bat
   trunk/tomcat/bin/version.sh
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/bin/version.sh
   trunk/tomcat/conf/
      - copied from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/conf/
   trunk/tomcat/conf/Catalina/
      - copied from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/conf/Catalina/
   trunk/tomcat/conf/Catalina/localhost/
      - copied from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/conf/Catalina/localhost/
   trunk/tomcat/conf/Catalina/localhost/scarab.allinone.xml.off
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/conf/Catalina/localhost/scarab.allinone.xml.off
   trunk/tomcat/conf/Catalina/localhost/scarab.inplace.xml.off
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/conf/Catalina/localhost/scarab.inplace.xml.off
   trunk/tomcat/conf/Catalina/localhost/scarab.xml
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/conf/Catalina/localhost/scarab.xml
   trunk/tomcat/conf/catalina.policy
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/conf/catalina.policy
   trunk/tomcat/conf/catalina.properties
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/conf/catalina.properties
   trunk/tomcat/conf/context.xml
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/conf/context.xml
   trunk/tomcat/conf/logging.properties
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/conf/logging.properties
   trunk/tomcat/conf/server.xml
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/conf/server.xml
   trunk/tomcat/conf/tomcat-users.xml
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/conf/tomcat-users.xml
   trunk/tomcat/conf/web.xml
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/conf/web.xml
   trunk/tomcat/lib/annotations-api.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/annotations-api.jar
   trunk/tomcat/lib/catalina-ant.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/catalina-ant.jar
   trunk/tomcat/lib/catalina-ha.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/catalina-ha.jar
   trunk/tomcat/lib/catalina-tribes.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/catalina-tribes.jar
   trunk/tomcat/lib/catalina.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/catalina.jar
   trunk/tomcat/lib/ecj-3.7.2.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/ecj-3.7.2.jar
   trunk/tomcat/lib/el-api.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/el-api.jar
   trunk/tomcat/lib/jasper-el.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/jasper-el.jar
   trunk/tomcat/lib/jasper.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/jasper.jar
   trunk/tomcat/lib/jsp-api.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/jsp-api.jar
   trunk/tomcat/lib/servlet-api.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/servlet-api.jar
   trunk/tomcat/lib/tomcat-api.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/tomcat-api.jar
   trunk/tomcat/lib/tomcat-coyote.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/tomcat-coyote.jar
   trunk/tomcat/lib/tomcat-dbcp.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/tomcat-dbcp.jar
   trunk/tomcat/lib/tomcat-i18n-es.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/tomcat-i18n-es.jar
   trunk/tomcat/lib/tomcat-i18n-fr.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/tomcat-i18n-fr.jar
   trunk/tomcat/lib/tomcat-i18n-ja.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/tomcat-i18n-ja.jar
   trunk/tomcat/lib/tomcat-jdbc.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/tomcat-jdbc.jar
   trunk/tomcat/lib/tomcat-util.jar
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/lib/tomcat-util.jar
   trunk/tomcat/logs/
      - copied from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/logs/
   trunk/tomcat/temp/
      - copied from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/temp/
   trunk/tomcat/temp/safeToDelete.tmp
      - copied unchanged from r11214, /branches/SCB3098_TomcatUpgrade7/tomcat/temp/safeToDelete.tmp
Removed:
   trunk/tomcat/common/
   trunk/tomcat/server/
   trunk/tomcat/webapps/scarab.allinone.xml.off
   trunk/tomcat/webapps/scarab.inplace.xml.off
   trunk/tomcat/webapps/scarab.xml
Modified:
   trunk/   (props changed)
   trunk/pom.xml
   trunk/properties.xsl   (props changed)
   trunk/src/webapp/WEB-INF/web.xml

Log:
MRG - SCB3098 Merged Tomcat 7 migration branch.

Modified: trunk/pom.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/pom.xml?view=diff&pathrev=11215&r1=11214&r2=11215
==============================================================================
--- trunk/pom.xml	(original)
+++ trunk/pom.xml	2012-05-04 01:02:04-0700
@@ -193,8 +193,8 @@
              <groupId>org.apache.maven.plugins</groupId>
              <artifactId>maven-compiler-plugin</artifactId>
              <configuration>
-                 <source>1.5</source>
-                 <target>1.5</target>
+                 <source>1.6</source>
+                 <target>1.6</target>
              </configuration>
           </plugin>
 		  

Modified: trunk/src/webapp/WEB-INF/web.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/web.xml?view=diff&pathrev=11215&r1=11214&r2=11215
==============================================================================
--- trunk/src/webapp/WEB-INF/web.xml	(original)
+++ trunk/src/webapp/WEB-INF/web.xml	2012-05-04 01:02:04-0700
@@ -24,7 +24,7 @@
             </param-value>            
         </init-param> 	
         <!-- Load this servlet at server startup time -->
-        <load-on-startup/>
+		<load-on-startup>1</load-on-startup>
 
     </servlet>
     <servlet>

Removed: trunk/tomcat/webapps/scarab.allinone.xml.off
Url: http://scarab.tigris.org/source/browse/scarab/trunk/tomcat/webapps/scarab.allinone.xml.off?view=markup&pathrev=11214

Removed: trunk/tomcat/webapps/scarab.inplace.xml.off
Url: http://scarab.tigris.org/source/browse/scarab/trunk/tomcat/webapps/scarab.inplace.xml.off?view=markup&pathrev=11214

Removed: trunk/tomcat/webapps/scarab.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/tomcat/webapps/scarab.xml?view=markup&pathrev=11214

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2957551