User: janb
Date: 02/02/20 19:32:15
Modified: src/main/org/jboss/web AbstractWebContainer.java
Log:
When setting the web context for a war deployment, the context set in the
J2eeModuleMetaData must be used. Two lines matching the deployment with the metadata
got deleted, resulting in all war deployments sharing the same web context (that of
the last web module in the application).
Revision Changes Path
1.30 +5 -2 jboss/src/main/org/jboss/web/AbstractWebContainer.java
Index: AbstractWebContainer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/web/AbstractWebContainer.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- AbstractWebContainer.java 20 Feb 2002 06:42:09 -0000 1.29
+++ AbstractWebContainer.java 21 Feb 2002 03:32:15 -0000 1.30
@@ -146,7 +146,7 @@
@see org.jboss.security.SecurityAssociation;
@author [EMAIL PROTECTED]
-@version $Revision: 1.29 $
+@version $Revision: 1.30 $
*/
public abstract class AbstractWebContainer
extends ServiceMBeanSupport
@@ -213,7 +213,10 @@
mod = (J2eeModuleMetaData) it.next();
if( mod.isWeb() )
{
- di.webContext = mod.getWebContext();
+ //only pick up the context for our war, the names should match
+ // The wars come from packages and thus are unpackaged under
/tmp/deploy/<intNumber>.myweb.war
+ if (di.shortName.lastIndexOf(mod.getFileName()) != -1)
+ di.webContext = mod.getWebContext();
}
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
