--- src/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java.sav1	2007-03-03 09:42:30.000000000 +0100

+++ src/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java	2008-10-29 20:15:57.000000000 +0100

@@ -71,12 +71,6 @@

         File tomcatHome;

         if (tomcat5x == null || tomcat5x.startsWith("$")) {

-            //System.out.println("INFO: Downloading Tomcat 5.0 from a mirror");

-            Installer installer = new ZipURLInstaller(

-                    new URL("http://mirrors.ibiblio.org/pub/mirrors/apache"

-                            + "/tomcat/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.zip"));

-            installer.install();

-            tomcatHome = installer.getHome();

         } else {

             tomcatHome = new File(tomcat5x);

         }

@@ -85,11 +79,11 @@

         // (2) Create the Cargo Container instance wrapping our physical container

         LocalConfiguration configuration = (LocalConfiguration)

                 new DefaultConfigurationFactory().createConfiguration(

-                        "tomcat5x", ConfigurationType.STANDALONE);

+                        "tomcat5x", ContainerType.INSTALLED, ConfigurationType.STANDALONE);

         container = (InstalledLocalContainer)

                 new DefaultContainerFactory().createContainer(

                         "tomcat5x", ContainerType.INSTALLED, configuration);

-        container.setHome(tomcatHome);

+        container.setHome(tomcat5x);

         // (3) Statically deploy WAR(s)

         configuration.addDeployable(getWAR("struts-blank"));