User: user57
Date: 02/02/27 01:24:26
Modified: src/main/org/jboss/deployment MainDeployer.java
Log:
o Release structure and server config changes
Revision Changes Path
1.11 +19 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MainDeployer.java 26 Feb 2002 23:45:04 -0000 1.10
+++ MainDeployer.java 27 Feb 2002 09:24:26 -0000 1.11
@@ -48,7 +48,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class MainDeployer
extends ServiceMBeanSupport
@@ -84,9 +84,12 @@
private File tempNativeDir;
- /** The system home directory (for dealing with relative file names). */
+ /** The home directory (for dealing with relative file names). */
private File homeDir;
+ /** The server home directory (for deploy dir). */
+ private File serverHomeDir;
+
/**
* variables <code>nativePrefix</code> and <code>nativeSuffix</code> hold the
* prefix and suffix of native libraries on this system. They are determined by
@@ -230,11 +233,15 @@
//used in isWatched
tempDirString = tempDir.toURL().toString();
- // get the system home directory
+ // get the home directory
homeDir = (File)server.getAttribute(ServerConfigImplMBean.OBJECT_NAME,
"HomeDir");
- //Watch in our standard directory. This should be derived from configuration
info.
- addDirectory("deploy");
+ // get the server home directory
+ serverHomeDir = (File)server.getAttribute(ServerConfigImplMBean.OBJECT_NAME,
"ServerHomeDir");
+
+ // Watch in our standard directory.
+ File file = new File(serverHomeDir, "deploy");
+ addDirectory(file.toURL());
}
/**
@@ -702,14 +709,21 @@
for (Iterator iterator = directories.listIterator(); iterator.hasNext();)
{
File dir = new File(((URL) iterator.next()).getFile());
+ if (!dir.exists()) {
+ log.warn("Skipping non-existant directory: " + dir);
+ continue;
+ }
+
if (trace)
{
log.trace("Scanning directory: " + dir);
}
+
File[] files = dir.listFiles();
if (files == null)
{
log.error("we have a problem null files in directory; should not
happen");
+ continue;
}
for (int i = 0; i < files.length; i++)
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
