Author: alain_defrance Date: 2010-11-22 09:16:31 -0500 (Mon, 22 Nov 2010) New Revision: 5202 Modified: components/wci/branches/adf/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java components/wci/branches/adf/test/servers/jboss51/pom.xml components/wci/branches/adf/wci/src/main/doc/wci-authentication.odp components/wci/branches/adf/wci/src/main/doc/wci-authentication.pdf Log: change cargo version & fix some problems about native jetty implementation Modified: components/wci/branches/adf/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java =================================================================== --- components/wci/branches/adf/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java 2010-11-22 12:45:20 UTC (rev 5201) +++ components/wci/branches/adf/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java 2010-11-22 14:16:31 UTC (rev 5202) @@ -111,7 +111,6 @@ else if (bean instanceof WebAppContext) { WebAppContext wac = (WebAppContext)bean; - System.out.println("ADDING WEBAPP " + wac.getWar()); registerWebAppContext(wac); } } @@ -137,7 +136,7 @@ public void remove(Relationship relationship) { - //ignore event for now + removeBean(relationship.getChild()); } private void startWebAppContext(WebAppContext webappContext) @@ -192,7 +191,6 @@ private void unregisterWebAppContext(WebAppContext wac) { - System.out.println("UNREGISTERWEBAPPCONTEXT : " + wac); if (monitoredContexts.contains(wac.getServletContext().getServletContextName())) { monitoredContexts.remove(wac.getServletContext().getServletContextName()); Modified: components/wci/branches/adf/test/servers/jboss51/pom.xml =================================================================== --- components/wci/branches/adf/test/servers/jboss51/pom.xml 2010-11-22 12:45:20 UTC (rev 5201) +++ components/wci/branches/adf/test/servers/jboss51/pom.xml 2010-11-22 14:16:31 UTC (rev 5202) @@ -190,12 +190,6 @@ <!-- JBoss Deployer --> <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-tools-jboss-deployer-5.1-and-onwards</artifactId> - <version>${version.cargo}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jboss.integration</groupId> <artifactId>jboss-profileservice-spi</artifactId> <version>5.1.0.SP1</version> @@ -374,6 +368,8 @@ </plugins> </build> <properties> + <!-- Fix 1.0.3 deployment problems with jboss51 deployer--> + <version.cargo>1.0.2</version.cargo> </properties> <profiles> Modified: components/wci/branches/adf/wci/src/main/doc/wci-authentication.odp =================================================================== (Binary files differ) Modified: components/wci/branches/adf/wci/src/main/doc/wci-authentication.pdf =================================================================== (Binary files differ)