User: d_jencks
Date: 02/04/13 18:19:53
Modified: src/main/org/jboss/ejb EJBDeployer.java EjbModule.java
Log:
Larry Sanderson's patch to enable deploying unpacked directories
Revision Changes Path
1.18 +6 -2 jboss/src/main/org/jboss/ejb/EJBDeployer.java
Index: EJBDeployer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EJBDeployer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- EJBDeployer.java 3 Apr 2002 08:25:18 -0000 1.17
+++ EJBDeployer.java 14 Apr 2002 01:19:53 -0000 1.18
@@ -67,7 +67,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Antman</a>.
* @author <a href="mailto:[EMAIL PROTECTED]">Scott Stark</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sacha Labourey</a>
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
*/
public class EJBDeployer
extends SubDeployerSupport
@@ -258,7 +258,8 @@
{
// To be accepted the deployment's root name must end in jar
- if (!di.url.getFile().endsWith("jar")) return false;
+ String urlStr = di.url.getFile();
+ if (!urlStr.endsWith("jar") && !urlStr.endsWith("jar/")) return false;
// However the jar must also contain at least one ejb-jar.xml
@@ -300,6 +301,9 @@
}
}
catch (Exception e) {throw new DeploymentException("problem in
init"+e.getMessage());}
+
+ // invoke super-class initialization
+ processNestedDeployments(di);
}
1.20 +7 -2 jboss/src/main/org/jboss/ejb/EjbModule.java
Index: EjbModule.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EjbModule.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- EjbModule.java 13 Apr 2002 16:10:11 -0000 1.19
+++ EjbModule.java 14 Apr 2002 01:19:53 -0000 1.20
@@ -80,7 +80,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Jencks</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Francisco Reverbel</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Adrian.Brock</a>
- * @version $Revision: 1.19 $
+ * @version $Revision: 1.20 $
*
* @jmx:mbean extends="org.jboss.system.ServiceMBean"
*/
@@ -149,7 +149,12 @@
public EjbModule(final DeploymentInfo di)
{
this.deploymentInfo = di;
- this.name = deploymentInfo.url.toString();
+ String name = deploymentInfo.url.toString();
+ if (name.endsWith("/"))
+ {
+ name = name.substring(0, name.length() - 1);
+ }
+ this.name = name;
}
public Map getModuleDataMap()
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development