12:37 p.m.
Author: julien(a)jboss.com
Date: 2008-02-19 13:37:25 -0500 (Tue, 19 Feb 2008)
New Revision: 10033
Modified:
modules/web/trunk/pom.xml
modules/web/trunk/web/pom.xml
modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6ServletContainerContext.java
modules/web/trunk/web/src/test/build.xml
Log:
hopefully now it's right
Modified: modules/web/trunk/pom.xml
===================================================================
--- modules/web/trunk/pom.xml 2008-02-19 18:09:37 UTC (rev 10032)
+++ modules/web/trunk/pom.xml 2008-02-19 18:37:25 UTC (rev 10033)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Web Module</name>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/web/trunk/web/pom.xml
===================================================================
--- modules/web/trunk/web/pom.xml 2008-02-19 18:09:37 UTC (rev 10032)
+++ modules/web/trunk/web/pom.xml 2008-02-19 18:37:25 UTC (rev 10033)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.web</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified:
modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6ServletContainerContext.java
===================================================================
---
modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6ServletContainerContext.java 2008-02-19
18:09:37 UTC (rev 10032)
+++
modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6ServletContainerContext.java 2008-02-19
18:37:25 UTC (rev 10033)
@@ -226,7 +226,7 @@
Container[] childrenContainers = host.findChildren();
for (Container childContainer : childrenContainers)
{
- if (childContainer instanceof Context)
+ if (childContainer instanceof StandardContext)
{
StandardContext context = (StandardContext)childContainer;
unregisterContext(context);
@@ -259,7 +259,7 @@
monitoredContexts.remove(context.getName());
//
- if (context.getAvailable())
+ if (context.getState() == 1)
{
stop(context);
}
Modified: modules/web/trunk/web/src/test/build.xml
===================================================================
--- modules/web/trunk/web/src/test/build.xml 2008-02-19 18:09:37 UTC (rev 10032)
+++ modules/web/trunk/web/src/test/build.xml 2008-02-19 18:37:25 UTC (rev 10033)
@@ -190,9 +190,6 @@
<path refid="mc.trove"/>
<path refid="mc.xerces"/>
<path refid="mc.javassist"/>
- <path refid="mc.jboss_common_logging_spi"/>
- <path refid="mc.jboss_common_logging_jdk"/>
- <path refid="mc.jboss_common_logging_log4j"/>
<path refid="mc.jboss_common_core"/>
<path refid="mc.jboss_vfs"/>
<path refid="mc.jboss_xb"/>
@@ -215,9 +212,6 @@
<path refid="mc.trove"/>
<path refid="mc.xerces"/>
<path refid="mc.javassist"/>
- <path refid="mc.jboss_common_logging_spi"/>
- <path refid="mc.jboss_common_logging_jdk"/>
- <path refid="mc.jboss_common_logging_log4j"/>
<path refid="mc.jboss_common_core"/>
<path refid="mc.jboss_vfs"/>
<path refid="mc.jboss_xb"/>
@@ -241,9 +235,6 @@
<path refid="mc.trove"/>
<path refid="mc.xerces"/>
<path refid="mc.javassist"/>
- <path refid="mc.jboss_common_logging_spi"/>
- <path refid="mc.jboss_common_logging_jdk"/>
- <path refid="mc.jboss_common_logging_log4j"/>
<path refid="mc.jboss_common_core"/>
<path refid="mc.jboss_vfs"/>
<path refid="mc.jboss_xb"/>
@@ -262,9 +253,6 @@
<path refid="mc.portal-test-generic"/>
<path refid="mc.trove"/>
<path refid="mc.javassist"/>
- <path refid="mc.jboss_common_logging_spi"/>
- <path refid="mc.jboss_common_logging_jdk"/>
- <path refid="mc.jboss_common_logging_log4j"/>
<path refid="mc.jboss_common_core"/>
<path refid="mc.jboss_vfs"/>
<path refid="mc.jboss_xb"/>
@@ -283,9 +271,6 @@
<path refid="mc.portal-test-generic"/>
<path refid="mc.trove"/>
<path refid="mc.javassist"/>
- <path refid="mc.jboss_common_logging_spi"/>
- <path refid="mc.jboss_common_logging_jdk"/>
- <path refid="mc.jboss_common_logging_log4j"/>
<path refid="mc.jboss_common_core"/>
<path refid="mc.jboss_vfs"/>
<path refid="mc.jboss_xb"/>
@@ -398,6 +383,7 @@
action="start"
wait="${cargo.wait}">
<sharedClasspath>
+
<path location="${dependency.portal-common.jar}"/>
<path location="${dependency.jboss-unit.jar}"/>
<path location="${dependency.jboss-unit-remote.jar}"/>
@@ -508,6 +494,11 @@
action="start"
wait="${cargo.wait}">
<sharedClasspath>
+
+ <path refid="mc.jboss_common_logging_spi"/>
+ <path refid="mc.jboss_common_logging_jdk"/>
+ <path refid="mc.jboss_common_logging_log4j"/>
+
<path location="${dependency.log4j.jar}"/>
<path location="${dependency.concurrent.jar}"/>
<path location="${dependency.portal-common.jar}"/>