Update to Tomcat7 (replacing Tomcat6)

- Remove the custom plugin to check for the applications readyness, since Tomcat 7 provides that as an option in server.xml config - Remove modifications to context.xml (due to no need for the custom plugin) and server.xml (modifications through vcap staging is sufficient) Change-Id: Iadff0c2705c1d145659fd3a42fa75d93fa1a154a
cloudfoundry · Mar 12, 2012 · 332dff5 · 332dff5
1 parent dfe3a02
commit 332dff5
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 202 deletions.
diff --git a/plugins/pom.xml b/plugins/pom.xml
diff --git a/plugins/tomcat_startup_listener/pom.xml b/plugins/tomcat_startup_listener/pom.xml
diff --git a/..._startup_listener/src/main/java/com/vmware/appcloud/tomcat/AppCloudLifecycleListener.java b/..._startup_listener/src/main/java/com/vmware/appcloud/tomcat/AppCloudLifecycleListener.java
diff --git a/...mcat_startup_listener/src/main/java/com/vmware/appcloud/tomcat/TomcatStartupListener.java b/...mcat_startup_listener/src/main/java/com/vmware/appcloud/tomcat/TomcatStartupListener.java
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,6 @@
 			<modules>
 				<module>cloudfoundry-runtime</module>
 				<module>auto-reconfiguration</module>
-				<module>plugins</module>
 			</modules>
 		</profile>
 		<profile>
@@ -26,7 +25,6 @@
 				<module>cloudfoundry-runtime</module>
 				<module>cloudfoundry-runtime-tests</module>
 				<module>auto-reconfiguration</module>
-				<module>plugins</module>
 			</modules>
 		</profile>
 	</profiles>

diff --git a/tomcat-setup/cf-tomcat.zip.sha1 b/tomcat-setup/cf-tomcat.zip.sha1
@@ -1 +1 @@
-293386e6ae37d9c01b9941cf5f8fa775a6969b91 *tomcat.zip
+fc3e24aeb72954e838f7aae9628db484ce8a29c7 *tomcat.zip
diff --git a/tomcat-setup/resources/conf/context.xml b/tomcat-setup/resources/conf/context.xml
diff --git a/tomcat-setup/resources/conf/server.xml b/tomcat-setup/resources/conf/server.xml
diff --git a/tomcat-setup/resources/lib/TomcatStartupListener-1.0.jar b/tomcat-setup/resources/lib/TomcatStartupListener-1.0.jar
diff --git a/tomcat-setup/tomcat_manifest.yml b/tomcat-setup/tomcat_manifest.yml
@@ -1,11 +1,11 @@
 ---
-version: 6.0.35
-download_uri: http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
+version: 7.0.26
+download_uri: http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.26/bin/apache-tomcat-7.0.26.tar.gz
 
-replace_files: [conf/server.xml, conf/context.xml]
+replace_files: []
 clear_dirs: [logs, temp, webapps, work]
 remove_files: [NOTICE, RELEASE-NOTES, RUNNING.txt, LICENSE]
-add_jars: [lib/TomcatStartupListener-1.0.jar]
+add_jars: []
 
 # Assumes that the environment variable 'VCAP' has been set to point to
 # the root of 'vcap' source hierarchy.