User: lsanders
Date: 02/04/17 18:55:23
Modified: src/main/org/jboss/deployment Tag: Branch_3_0
MainDeployer.java
Log:
Copying from Trunk
Revision Changes Path
No revision
No revision
1.28.2.1 +10 -5 jboss-system/src/main/org/jboss/deployment/MainDeployer.java
Index: MainDeployer.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-system/src/main/org/jboss/deployment/MainDeployer.java,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -r1.28 -r1.28.2.1
--- MainDeployer.java 15 Apr 2002 02:48:53 -0000 1.28
+++ MainDeployer.java 18 Apr 2002 01:55:23 -0000 1.28.2.1
@@ -58,7 +58,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
- * @version $Revision: 1.28 $
+ * @version $Revision: 1.28.2.1 $
*
* @jmx:mbean name="jboss.system:service=MainDeployer"
* extends="org.jboss.system.ServiceMBean,
org.jboss.deployment.DeployerMBean"
@@ -729,7 +729,6 @@
classPath = mainAttributes.getValue(Attributes.Name.CLASS_PATH);
}
- URL[] libs = {};
if (classPath != null)
{
ArrayList tmp = new ArrayList();
@@ -745,14 +744,20 @@
try
{
- lib = new URL(sdi.url, tk);
+ if (sdi.isDirectory)
+ {
+ File parentDir = new File(sdi.url.getPath()).getParentFile();
+ lib = new File(parentDir, tk).toURL();
+ }
+ else
+ {
+ lib = new URL(sdi.url, tk);
+ }
if (!isDeployed(lib))
{
// Try having it as a full subdeployment
sub = new DeploymentInfo(lib, sdi);
-
- deploy(sub);
}
}
catch (Exception ignore)
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
