Diff
Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ConfigurationFactory.java (2552 => 2553)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ConfigurationFactory.java 2006-03-14 20:31:37 UTC (rev 2552)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ConfigurationFactory.java 2006-03-14 20:34:23 UTC (rev 2553)
@@ -35,7 +35,7 @@
import org.openejb.loader.SystemInstance;
import org.openejb.util.Logger;
import org.openejb.util.Messages;
-import org.openejb.util.FileUtils;
+import org.openejb.loader.FileUtils;
import java.io.File;
import java.io.FilenameFilter;
Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/Deploy.java (2552 => 2553)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/Deploy.java 2006-03-14 20:31:37 UTC (rev 2552)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/Deploy.java 2006-03-14 20:34:23 UTC (rev 2553)
@@ -10,12 +10,10 @@
import java.net.MalformedURLException;
import java.util.Properties;
import java.util.StringTokenizer;
-import java.util.HashMap;
import org.openejb.OpenEJBException;
import org.openejb.loader.SystemInstance;
import org.openejb.alt.config.ejb11.EjbDeployment;
-import org.openejb.alt.config.ejb11.EjbJar;
import org.openejb.alt.config.ejb11.MethodParams;
import org.openejb.alt.config.ejb11.OpenejbJar;
import org.openejb.alt.config.ejb11.QueryMethod;
@@ -28,7 +26,6 @@
import org.openejb.util.Messages;
import org.openejb.util.SafeToolkit;
import org.openejb.util.Logger;
-import org.openejb.util.FileUtils;
public class Deploy {
private static final String helpBase = "META-INF/org.openejb.cli/";
Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/TempCodebase.java (2552 => 2553)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/TempCodebase.java 2006-03-14 20:31:37 UTC (rev 2552)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/TempCodebase.java 2006-03-14 20:34:23 UTC (rev 2553)
@@ -1,8 +1,8 @@
package org.openejb.alt.config;
import org.openejb.OpenEJBException;
+import org.openejb.loader.FileUtils;
import org.openejb.util.SafeToolkit;
-import org.openejb.util.FileUtils;
import java.util.HashMap;
import java.net.URL;
Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateful/SimplePassivater.java (2552 => 2553)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateful/SimplePassivater.java 2006-03-14 20:31:37 UTC (rev 2552)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/core/stateful/SimplePassivater.java 2006-03-14 20:34:23 UTC (rev 2553)
@@ -10,7 +10,6 @@
import java.util.Properties;
import org.openejb.core.EnvProps;
-import org.openejb.util.FileUtils;
import org.openejb.loader.SystemInstance;
import org.openejb.SystemException;
Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/Embedder.java (2552 => 2553)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/Embedder.java 2006-03-14 20:31:37 UTC (rev 2552)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/Embedder.java 2006-03-14 20:34:23 UTC (rev 2553)
@@ -16,8 +16,6 @@
*/
package org.openejb.loader;
-import org.openejb.util.FileUtils;
-
import java.io.File;
/**
Copied: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/FileUtils.java (from rev 2552, trunk/openejb3/container/openejb-core/src/main/java/org/openejb/util/FileUtils.java) (2552 => 2553)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/util/FileUtils.java 2006-03-14 20:31:37 UTC (rev 2552)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/FileUtils.java 2006-03-14 20:34:23 UTC (rev 2553)
@@ -0,0 +1,152 @@
+package org.openejb.loader;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Hashtable;
+
+public class FileUtils {
+
+ private static final java.util.Random _random = new java.util.Random();
+
+ private File home;
+
+ private FileUtils(String homeDir, String defaultDir) {
+ this(homeDir, defaultDir, System.getProperties());
+ }
+
+ public FileUtils(String homeDir, String defaultDir, Hashtable env) {
+ String homePath = null;
+ try {
+ homePath = (String) env.get(homeDir);
+ if (homePath == null) {
+ homePath = (String) env.get(defaultDir);
+ }
+
+ if (homePath == null) {
+ homePath = System.getProperty("user.dir");
+ }
+
+ home = new File(homePath);
+ if (!home.exists() || (home.exists() && !home.isDirectory())) {
+ homePath = System.getProperty("user.dir");
+ home = new File(homePath);
+ }
+
+ home = home.getAbsoluteFile();
+ } catch (SecurityException e) {
+
+ }
+ }
+
+ public File getDirectory(String path) throws IOException {
+ return getDirectory(path, false);
+ }
+
+ public boolean equals(Object obj) {
+ if (!(obj instanceof FileUtils)) return false;
+ FileUtils that = (FileUtils) obj;
+ return this.getDirectory().equals(that.getDirectory());
+ }
+
+ public File getDirectory(String path, boolean create) throws IOException {
+ File dir = null;
+
+ dir = new File(home, path);
+ dir = dir.getCanonicalFile();
+
+ if (!dir.exists() && create) {
+ try {
+ if (!dir.mkdirs())
+ throw new IOException("Cannot create the directory " + dir.getPath());
+ } catch (SecurityException e) {
+ throw new IOException(
+ "Permission denied: Cannot create the directory " + dir.getPath() + " : " + e.getMessage());
+ }
+ } else if (dir.exists() && !dir.isDirectory()) {
+ throw new IOException("The path specified is not a valid directory: " + dir.getPath());
+ }
+
+ return dir;
+ }
+
+ public File getDirectory() {
+ return home;
+ }
+
+ public void setDirectory(File dir) {
+ this.home = dir;
+ }
+
+ public File getFile(String path) throws java.io.FileNotFoundException, java.io.IOException {
+ return getFile(path, true);
+ }
+
+ public File getFile(String path, boolean validate) throws java.io.FileNotFoundException, java.io.IOException {
+ File file = null;
+
+ file = new File(path);
+
+ if (!file.isAbsolute()) {
+ file = new File(home, path);
+ }
+
+ if (validate && !file.exists()) {
+ throw new FileNotFoundException("The path specified is not a valid file: " + file.getPath());
+ } else if (validate && file.isDirectory()) {
+ throw new FileNotFoundException("The path specified is a directory, not a file: " + file.getPath());
+ }
+
+ return file;
+ }
+
+ public static File createTempDirectory(String pathPrefix) throws java.io.IOException {
+ for (int maxAttempts = 100; maxAttempts > 0; --maxAttempts) {
+ String path = pathPrefix + _random.nextLong();
+ java.io.File tmpDir = new java.io.File(path);
+ if (tmpDir.exists()) {
+ continue;
+ } else {
+ tmpDir.mkdir();
+ return tmpDir;
+ }
+ }
+ throw new java.io.IOException("Can't create temporary directory.");
+ }
+
+ public static File createTempDirectory() throws java.io.IOException {
+ String prefix = System.getProperty("java.io.tmpdir", File.separator + "tmp") + File.separator + "openejb";
+ return createTempDirectory(prefix);
+ }
+
+ public static void copyFile(File destination, File source) throws java.io.IOException {
+ copyFile(destination, source, false);
+ }
+
+ public static void copyFile(File destination, File source, boolean deleteSourceFile) throws java.io.IOException {
+ FileInputStream in = null;
+ FileOutputStream out = null;
+ try {
+ in = new FileInputStream(source);
+ out = new FileOutputStream(destination);
+
+ int len;
+ byte[] buffer = new byte[4096];
+ while ((len = in.read(buffer)) != -1) {
+ out.write(buffer, 0, len);
+ }
+ } catch (java.io.IOException e) {
+ throw e;
+ } finally {
+ in.close();
+ out.close();
+ }
+
+ if (deleteSourceFile) {
+ source.delete();
+ }
+ }
+
+}
Property changes: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/FileUtils.java
Name: svn:executable
+ *
Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/OpenEJBInstance.java (2552 => 2553)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/OpenEJBInstance.java 2006-03-14 20:31:37 UTC (rev 2552)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/OpenEJBInstance.java 2006-03-14 20:34:23 UTC (rev 2553)
@@ -2,9 +2,7 @@
import org.openejb.loader.ClassPath;
import org.openejb.loader.SystemInstance;
-import org.openejb.util.FileUtils;
-import javax.servlet.ServletException;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
import java.util.Properties;
Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/SystemInstance.java (2552 => 2553)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/SystemInstance.java 2006-03-14 20:31:37 UTC (rev 2552)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/loader/SystemInstance.java 2006-03-14 20:34:23 UTC (rev 2553)
@@ -3,8 +3,6 @@
import java.util.Properties;
import java.util.HashMap;
-import org.openejb.util.FileUtils;
-
/**
* This class aims to be the one and only static in the entire system
* A static, singleton, instance of this class can be created with the init(props) method
Deleted: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/util/FileUtils.java (2552 => 2553)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/util/FileUtils.java 2006-03-14 20:31:37 UTC (rev 2552)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/util/FileUtils.java 2006-03-14 20:34:23 UTC (rev 2553)
@@ -1,158 +0,0 @@
-package org.openejb.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.Properties;
-
-import org.openejb.OpenEJBException;
-import org.openejb.loader.SystemInstance;
-
-public class FileUtils {
-
- private static final java.util.Random _random = new java.util.Random();
-
- private File home;
-
- private FileUtils(String homeDir, String defaultDir) {
- this(homeDir, defaultDir, System.getProperties());
- }
-
- public FileUtils(String homeDir, String defaultDir, Hashtable env) {
- String homePath = null;
- try {
- homePath = (String) env.get(homeDir);
- if (homePath == null) {
- homePath = (String) env.get(defaultDir);
- }
-
- if (homePath == null) {
- homePath = System.getProperty("user.dir");
- }
-
- home = new File(homePath);
- if (!home.exists() || (home.exists() && !home.isDirectory())) {
- homePath = System.getProperty("user.dir");
- home = new File(homePath);
- }
-
- home = home.getAbsoluteFile();
- } catch (SecurityException e) {
-
- }
- }
-
- public File getDirectory(String path) throws IOException {
- return getDirectory(path, false);
- }
-
- public boolean equals(Object obj) {
- if (!(obj instanceof FileUtils)) return false;
- FileUtils that = (FileUtils) obj;
- return this.getDirectory().equals(that.getDirectory());
- }
-
- public File getDirectory(String path, boolean create) throws IOException {
- File dir = null;
-
- dir = new File(home, path);
- dir = dir.getCanonicalFile();
-
- if (!dir.exists() && create) {
- try {
- if (!dir.mkdirs())
- throw new IOException("Cannot create the directory " + dir.getPath());
- } catch (SecurityException e) {
- throw new IOException(
- "Permission denied: Cannot create the directory " + dir.getPath() + " : " + e.getMessage());
- }
- } else if (dir.exists() && !dir.isDirectory()) {
- throw new IOException("The path specified is not a valid directory: " + dir.getPath());
- }
-
- return dir;
- }
-
- public File getDirectory() {
- return home;
- }
-
- public void setDirectory(File dir) {
- this.home = dir;
- }
-
- public File getFile(String path) throws java.io.FileNotFoundException, java.io.IOException {
- return getFile(path, true);
- }
-
- public File getFile(String path, boolean validate) throws java.io.FileNotFoundException, java.io.IOException {
- File file = null;
-
- file = new File(path);
-
- if (!file.isAbsolute()) {
- file = new File(home, path);
- }
-
- if (validate && !file.exists()) {
- throw new FileNotFoundException("The path specified is not a valid file: " + file.getPath());
- } else if (validate && file.isDirectory()) {
- throw new FileNotFoundException("The path specified is a directory, not a file: " + file.getPath());
- }
-
- return file;
- }
-
- public static File createTempDirectory(String pathPrefix) throws java.io.IOException {
- for (int maxAttempts = 100; maxAttempts > 0; --maxAttempts) {
- String path = pathPrefix + _random.nextLong();
- java.io.File tmpDir = new java.io.File(path);
- if (tmpDir.exists()) {
- continue;
- } else {
- tmpDir.mkdir();
- return tmpDir;
- }
- }
- throw new java.io.IOException("Can't create temporary directory.");
- }
-
- public static File createTempDirectory() throws java.io.IOException {
- String prefix = System.getProperty("java.io.tmpdir", File.separator + "tmp") + File.separator + "openejb";
- return createTempDirectory(prefix);
- }
-
- public static void copyFile(File destination, File source) throws java.io.IOException {
- copyFile(destination, source, false);
- }
-
- public static void copyFile(File destination, File source, boolean deleteSourceFile) throws java.io.IOException {
- FileInputStream in = null;
- FileOutputStream out = null;
- try {
- in = new FileInputStream(source);
- out = new FileOutputStream(destination);
-
- int len;
- byte[] buffer = new byte[4096];
- while ((len = in.read(buffer)) != -1) {
- out.write(buffer, 0, len);
- }
- } catch (java.io.IOException e) {
- throw e;
- } finally {
- in.close();
- out.close();
- }
-
- if (deleteSourceFile) {
- source.delete();
- }
- }
-
-}
Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/util/Logger.java (2552 => 2553)
--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/util/Logger.java 2006-03-14 20:31:37 UTC (rev 2552)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/util/Logger.java 2006-03-14 20:34:23 UTC (rev 2553)
@@ -1,10 +1,10 @@
package org.openejb.util;
import org.openejb.loader.SystemInstance;
+import org.openejb.loader.FileUtils;
import org.apache.log4j.Category;
import org.apache.log4j.Level;
import org.apache.log4j.PropertyConfigurator;
-import org.apache.commons.logging.LogFactory;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
Modified: trunk/openejb3/server/openejb-server/src/main/java/org/openejb/server/ServiceManager.java (2552 => 2553)
--- trunk/openejb3/server/openejb-server/src/main/java/org/openejb/server/ServiceManager.java 2006-03-14 20:31:37 UTC (rev 2552)
+++ trunk/openejb3/server/openejb-server/src/main/java/org/openejb/server/ServiceManager.java 2006-03-14 20:34:23 UTC (rev 2553)
@@ -1,20 +1,16 @@
package org.openejb.server;
-import org.openejb.ClassLoaderUtil;
import org.openejb.loader.SystemInstance;
+import org.openejb.loader.FileUtils;
import org.openejb.util.Logger;
import org.openejb.util.Messages;
-import org.openejb.util.FileUtils;
import org.openejb.util.ResourceFinder;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.net.InetAddress;
-import java.net.URL;
import java.util.HashMap;
import java.util.Properties;
import java.util.Map;
