svn commit: r1142242 - in /openejb/trunk/openejb3: ./ assembly/itest-runner/src/test/groovy/commands/ assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/ assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/ examples/webapps/moviefu...

[jg...@apache.org]

Author: jgallimore
Date: Sat Jul  2 16:20:00 2011
New Revision: 1142242

URL: http://svn.apache.org/viewvc?rev=1142242&view=rev
Log:
Upgrade to Tomcat 7.0.16

Modified:
    openejb/trunk/openejb3/assembly/itest-runner/src/test/groovy/commands/SetupCommand.groovy
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
    openejb/trunk/openejb3/examples/webapps/moviefun/app/pom.xml
    openejb/trunk/openejb3/pom.xml

Modified: openejb/trunk/openejb3/assembly/itest-runner/src/test/groovy/commands/SetupCommand.groovy
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/itest-runner/src/test/groovy/commands/SetupCommand.groovy?rev=1142242&r1=1142241&r2=1142242&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/itest-runner/src/test/groovy/commands/SetupCommand.groovy (original)
+++ openejb/trunk/openejb3/assembly/itest-runner/src/test/groovy/commands/SetupCommand.groovy Sat Jul  2 16:20:00 2011
@@ -87,7 +87,7 @@ class SetupCommand {
 
   def execute() {
     execute("6.0.32")
-    execute("7.0.11")
+    execute("7.0.16")
   }
 
   def execute(tomcatVersion) {

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml?rev=1142242&r1=1142241&r2=1142242&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml Sat Jul  2 16:20:00 2011
@@ -145,7 +145,7 @@
   <properties>
     <localRepository>${settings.localRepository}</localRepository>
     <examples.version>1.1-SNAPSHOT</examples.version>
-    <tomcat.version>7.0.11</tomcat.version>
+    <tomcat.version>7.0.16</tomcat.version>
     <http.proxy.host>${settings.activeProxy.host}</http.proxy.host>
     <http.proxy.port>${settings.activeProxy.port}</http.proxy.port>
     <http.proxy.username>${settings.activeProxy.username}</http.proxy.username>

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml?rev=1142242&r1=1142241&r2=1142242&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml Sat Jul  2 16:20:00 2011
@@ -28,7 +28,7 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>${basedir}/target/apache-tomcat-7.0.11</directory>
+      <directory>${basedir}/target/apache-tomcat-7.0.16</directory>
       <outputDirectory>/apache-tomee-${version}</outputDirectory>
       <includes>
         <include>**/*</include>
@@ -38,7 +38,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>${basedir}/target/apache-tomcat-7.0.11</directory>
+      <directory>${basedir}/target/apache-tomcat-7.0.16</directory>
       <outputDirectory>/apache-tomee-${version}</outputDirectory>
       <includes>
         <include>**/bin/**/*</include>

Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/pom.xml?rev=1142242&r1=1142241&r2=1142242&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/pom.xml Sat Jul  2 16:20:00 2011
@@ -145,7 +145,7 @@
             <configuration>
               <tomcatHttpPort>9999</tomcatHttpPort>
               <tomcatShutdownPort>9998</tomcatShutdownPort>
-              <tomcatVersion>7.0.11</tomcatVersion>
+              <tomcatVersion>7.0.16</tomcatVersion>
               <webapps>
                 <webappArtifact>
                   <groupId>org.apache.openejb</groupId>
@@ -184,4 +184,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=1142242&r1=1142241&r2=1142242&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Sat Jul  2 16:20:00 2011
@@ -117,7 +117,7 @@
     <openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name>
 
     <!-- Used in assembly/openejb-tomcat* projects  -->
-    <tomcatVersion>7.0.11</tomcatVersion>
+    <tomcatVersion>7.0.16</tomcatVersion>
 
     <!--
        - http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding