User: starksm
Date: 02/02/21 00:41:10
Modified: src/main/org/jboss/deployment MainDeployer.java
Log:
Simple fix for the current war deployment problems, don't do
subdeployments of the contents of wars.
Revision Changes Path
1.20 +6 -5 jboss/src/main/org/jboss/deployment/MainDeployer.java
Index: MainDeployer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/deployment/MainDeployer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MainDeployer.java 15 Feb 2002 06:18:30 -0000 1.19
+++ MainDeployer.java 21 Feb 2002 08:41:08 -0000 1.20
@@ -45,7 +45,8 @@
* Takes a series of URL to watch, detects changes and calls the appropriate
Deployers
*
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
- * @version $Revision: 1.19 $
+ * @author <a href="mailto:[EMAIL PROTECTED]">Scott Stark</a>
+ * @version $Revision: 1.20 $
*/
public class MainDeployer
extends ServiceMBeanSupport
@@ -685,10 +686,11 @@
protected void deploySubPackages(DeploymentInfo di)
throws DeploymentException
{
- // If XML only no subdeployment to speak of
+ // If XML only no subdeployment to speak of. We also do not
+ // break a war into subdeployments as this opens the door to
+ // servlet 2.3 classloading stuff we don't want to deal with here
// FIXME do the sub deploy for directory and the move to
- // if (di.isXML) return;
- if (di.isXML || di.isDirectory)
+ if (di.isXML || di.isDirectory || di.shortName.endsWith(".war") )
{
return ;
}
@@ -1020,4 +1022,3 @@
private synchronized int getNextID() { return id++;}
}
-
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development