User: mnf999
Date: 02/02/04 09:01:50
Modified: src/main/org/jboss/web AbstractWebContainer.java
Log:
Patch for the missed context due to filename
Revision Changes Path
1.19 +9 -6 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- AbstractWebContainer.java 2002/02/02 22:45:59 1.18
+++ AbstractWebContainer.java 2002/02/04 17:01:12 1.19
@@ -118,7 +118,7 @@
@see org.jboss.security.SecurityAssociation;
@author [EMAIL PROTECTED]
-@version $Revision: 1.18 $
+@version $Revision: 1.19 $
*/
public abstract class AbstractWebContainer
extends ServiceMBeanSupport
@@ -177,7 +177,7 @@
if (di.parent != null && di.parent.metaData instanceof
J2eeApplicationMetaData)
{
J2eeApplicationMetaData app = (J2eeApplicationMetaData)
di.parent.metaData;
-
+
J2eeModuleMetaData mod;
Iterator it = app.getModules();
while (it.hasNext())
@@ -187,8 +187,11 @@
if (mod.isWeb())
{
- //only pick up the context for our war
- if (mod.getFileName().indexOf(di.shortName) != -1) 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();
+
}
}
}
@@ -200,7 +203,7 @@
// make sure the context starts with a slash
if (!di.webContext.startsWith("/")) di.webContext = "/"+di.webContext;
-
+
// resolve the watch
if (di.url.getProtocol().startsWith("http"))
{
@@ -551,7 +554,7 @@
new String[] {"org.jboss.deployment.DeployerMBean"});
}
catch (Exception e) {log.error("Could not register with MainDeployer", e);}
-
+
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
