User: schulze
Date: 00/11/10 15:33:30
Modified: src/main/org/jboss/ejb AutoDeployer.java
Log:
fixed the MANIFEST.MF NullPointerException in J2eeDeployer
added multible instance capabilities to J2eeDeployer and AutoDeployer (see separate
post on jboss-user)
Revision Changes Path
1.10 +19 -9 jboss/src/main/org/jboss/ejb/AutoDeployer.java
Index: AutoDeployer.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/AutoDeployer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AutoDeployer.java 2000/11/06 23:41:56 1.9
+++ AutoDeployer.java 2000/11/10 23:33:29 1.10
@@ -40,7 +40,7 @@
*
* @see ContainerFactory
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class AutoDeployer
extends ServiceMBeanSupport
@@ -53,6 +53,9 @@
// Callback to the JMX agent
MBeanServer server;
+ // in case more then one J2eeDeployers are available
+ String namedDeployer;
+
// JMX name of the ContainerFactory
ObjectName factoryName;
@@ -68,16 +71,21 @@
// These URL's are being watched
ArrayList watchedURLs = new ArrayList();
- // The logger for this service
- Log log = new Log("Auto deploy");
-
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
public AutoDeployer(String urlList)
+ {
+ this ("", urlList);
+ }
+
+
+ public AutoDeployer(String _namedDeployer, String urlList)
{
- addURLs(urlList);
- }
+ namedDeployer = _namedDeployer.equals("") ? "" : " "+_namedDeployer;
+ log = new Log (getName());
+ addURLs(urlList);
+ }
public void addURLs(String urlList)
{
@@ -239,6 +247,7 @@
// Check old timestamp -- always deploy if first check
if ((deployment.lastModified == 0) || (deployment.lastModified < lm))
{
+ /*
// in case of file first check if it is really completely copied
// (check file size wait 1 second and compare new with old file
size)
long size = new File(deployment.watch.getFile()).length ();
@@ -250,6 +259,7 @@
log.log (deployment.url+" is not yet ready for deploy...");
continue;
}
+ */
log.log("Auto deploy of "+deployment.url);
deployment.lastModified = lm;
@@ -278,21 +288,21 @@
// ServiceMBeanSupport overrides ---------------------------------
public String getName()
{
- return "Auto deployer";
+ return "Auto deploy"+namedDeployer;
}
protected ObjectName getObjectName(MBeanServer server, ObjectName name)
throws javax.management.MalformedObjectNameException
{
this.server = server;
- return new ObjectName(OBJECT_NAME);
+ return new ObjectName(OBJECT_NAME+namedDeployer);
}
protected void initService()
throws Exception
{
// Save JMX name of ContainerFactory
- factoryName = new ObjectName(J2eeDeployerMBean.OBJECT_NAME);
+ factoryName = new ObjectName(J2eeDeployerMBean.OBJECT_NAME + namedDeployer);
}
protected void startService()
