svn commit: r552247 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JarExtractor.java

[dblevins]

Author: dblevins
Date: Sat Jun 30 22:09:37 2007
New Revision: 552247

URL: http://svn.apache.org/viewvc?view=rev&rev=552247
Log:
Fixed to not always extract ears into a directory named "apps", now will 
extract the ear in the same directory the ear itself is in.

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JarExtractor.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JarExtractor.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JarExtractor.java?view=diff&rev=552247&r1=552246&r2=552247
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JarExtractor.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JarExtractor.java
 Sat Jun 30 22:09:37 2007
@@ -53,14 +53,7 @@
     public static File extract(URL jar, String pathname, File file)
             throws IOException {
 
-        // Make sure that there is no such directory already existing
-        FileUtils base = SystemInstance.get().getBase();
-        File appBase = base.getDirectory("apps", true);
-        if (!appBase.exists() || !appBase.isDirectory()) {
-            throw new IOException("" + appBase.getAbsolutePath());
-        }
-
-        File docBase = new File(appBase, pathname);
+        File docBase = new File(file.getParentFile(), pathname);
         if (docBase.exists()) {
             // Ear file is already installed
             return docBase;