[portal-commits] JBoss Portal SVN: r11900 - in modules/web/trunk: web and 2 other directories.

Author: mwringe Date: 2008-09-12 13:31:05 -0400 (Fri, 12 Sep 2008) New Revision: 11900 Modified: modules/web/trunk/build/pom.xml modules/web/trunk/web/pom.xml modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6Handler.java modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6ServletContainerContext.java modules/web/trunk/web/src/test/build.xml Log: Update to use Cargo alpha 6. Modified: modules/web/trunk/build/pom.xml =================================================================== --- modules/web/trunk/build/pom.xml 2008-09-12 17:25:06 UTC (rev 11899) +++ modules/web/trunk/build/pom.xml 2008-09-12 17:31:05 UTC (rev 11900) @@ -39,7 +39,7 @@ <version.apache.commons-logging>1.1.1</version.apache.commons-logging> <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer> - <version.cargo>1.0-alpha-5</version.cargo> + <version.cargo>1.0-alpha-6</version.cargo> <version.junit>3.8.1</version.junit> <version.ant>1.7.0</version.ant> </properties> Modified: modules/web/trunk/web/pom.xml =================================================================== --- modules/web/trunk/web/pom.xml 2008-09-12 17:25:06 UTC (rev 11899) +++ modules/web/trunk/web/pom.xml 2008-09-12 17:31:05 UTC (rev 11900) @@ -150,6 +150,17 @@ <artifactId>cargo-core-uberjar</artifactId> <version>${version.cargo}</version> </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-ant</artifactId> + <version>${version.cargo}</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6Handler.java =================================================================== --- modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6Handler.java 2008-09-12 17:25:06 UTC (rev 11899) +++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6Handler.java 2008-09-12 17:31:05 UTC (rev 11900) @@ -3,15 +3,11 @@ //import java.io.IOException; // //import javax.servlet.ServletException; -//import javax.servlet.http.HttpServlet; //import javax.servlet.http.HttpServletRequest; //import javax.servlet.http.HttpServletResponse; // -//import org.jboss.portal.web.impl.DefaultServletContainerFactory; -//import org.jboss.portal.web.impl.tomcat.TC6ServletContainerContext; //import org.mortbay.jetty.Server; //import org.mortbay.jetty.handler.AbstractHandler; -//import org.mortbay.jetty.handler.DefaultHandler; // //public class Jetty6Handler extends AbstractHandler //{ Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6ServletContainerContext.java =================================================================== --- modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6ServletContainerContext.java 2008-09-12 17:25:06 UTC (rev 11899) +++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6ServletContainerContext.java 2008-09-12 17:31:05 UTC (rev 11900) @@ -5,8 +5,6 @@ //import java.util.Set; // //import javax.servlet.ServletContext; -//import javax.servlet.ServletContextEvent; -//import javax.servlet.ServletContextListener; //import javax.servlet.ServletException; //import javax.servlet.http.HttpServletRequest; //import javax.servlet.http.HttpServletResponse; @@ -14,19 +12,17 @@ //import org.jboss.portal.web.RequestDispatchCallback; //import org.jboss.portal.web.command.CommandDispatcher; //import org.jboss.portal.web.impl.DefaultServletContainerFactory; -//import org.jboss.portal.web.impl.tomcat.TC6WebAppContext; //import org.jboss.portal.web.spi.ServletContainerContext; -//import org.mortbay.component.AbstractLifeCycleListener; //import org.mortbay.component.Container; -//import org.mortbay.component.LifeCycleEvent; -//import org.mortbay.component.LifeCycleListener; +//import org.mortbay.component.LifeCycle; +//import org.mortbay.component.LifeCycle.Listener; //import org.mortbay.component.Container.Relationship; //import org.mortbay.jetty.Handler; //import org.mortbay.jetty.Server; //import org.mortbay.jetty.handler.ContextHandlerCollection; //import org.mortbay.jetty.webapp.WebAppContext; // -//public class Jetty6ServletContainerContext implements ServletContainerContext, org.mortbay.component.Container.Listener, LifeCycleListener +//public class Jetty6ServletContainerContext implements ServletContainerContext, org.mortbay.component.Container.Listener, LifeCycle.Listener //{ // // private Registration registration; @@ -230,29 +226,29 @@ // } // } // -// public void failedEvent(LifeCycleEvent lce) +// public void lifeCycleFailure(LifeCycle lifeCycle, Throwable t) // { -// //ignore event for now +// //ignore event // } // -// public void startingEvent(LifeCycleEvent lce) +// public void lifeCycleStarted(LifeCycle lifeCycle) // { -// //ignore event for now +// startWebAppContext((WebAppContext)lifeCycle); // } // -// public void startedEvent(LifeCycleEvent lce) +// public void lifeCycleStarting(LifeCycle lifeCycle) // { -// startWebAppContext((WebAppContext)lce.getLifeCycleComponent()); +// //ignore event // } // -// public void stoppedEvent(LifeCycleEvent lce) +// public void lifeCycleStopped(LifeCycle lifeCycle) // { -// stopWebAppContext((WebAppContext)lce.getLifeCycleComponent()); +// stopWebAppContext((WebAppContext)lifeCycle); // } // -// public void stoppingEvent(LifeCycleEvent lce) +// public void lifeCycleStopping(LifeCycle lifeCycle) // { -// //ignore event for now +// //Ignore event // } // //} Modified: modules/web/trunk/web/src/test/build.xml =================================================================== --- modules/web/trunk/web/src/test/build.xml 2008-09-12 17:25:06 UTC (rev 11899) +++ modules/web/trunk/web/src/test/build.xml 2008-09-12 17:31:05 UTC (rev 11900) @@ -612,7 +612,7 @@ <cargo containerId="jboss42x" home="${test.jboss-4.2.home}" - log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" + log="${cargo.log.dir}/cargo.${test.id}.startup.log" output="${cargo.log.dir}/cargo.${test.id}.server.log" action="start" wait="${cargo.wait}"> @@ -623,7 +623,6 @@ </sharedClasspath> <configuration> <property name="cargo.rmi.port" value="1299"/> - <property name="cargo.jboss.server.xml" value="/tmp/server.xml"/> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> <deployable type="war" file="${cargo.war}"/> @@ -636,7 +635,7 @@ <cargo containerId="jboss42x" home="${test.jboss-4.2.home}" - log="${cargo.log.dir}/cargo.${test.id}.startup.log" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" action="stop"> <configuration> <property name="cargo.rmi.port" value="1299"/> @@ -743,10 +742,10 @@ <cargo containerId="jboss5x" home="${test.jboss-5.0.home}" - log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" + log="${cargo.log.dir}/cargo.${test.id}.startup.log" output="${cargo.log.dir}/cargo.${test.id}.server.log" action="start" - wait="${cargo.wait}"> + wait="false"> <sharedClasspath> <path refid="jboss-5.0-shared"/> @@ -766,10 +765,12 @@ <cargo containerId="jboss5x" home="${test.jboss-5.0.home}" - log="${cargo.log.dir}/cargo.${test.id}.startup.log" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" action="stop"> <configuration> - <property name="cargo.rmi.port" value="1299"/> + <!-- NOTE: this is wrong, the value should be 1299 but there is a bug in alpha 6 for Cargo --> + <property name="cargo.rmi.port" value="1099"/> + <!-- <property name="cargo.rmi.port" value="1299"/> --> </configuration> </cargo> </target>