geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r527482 - in /geronimo/server/trunk/modules: geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java
Date Wed, 11 Apr 2007 13:06:45 GMT
Author: akulshreshtha
Date: Wed Apr 11 06:06:45 2007
New Revision: 527482

URL: http://svn.apache.org/viewvc?view=rev&rev=527482
Log:
GERONIMO-3011 Resolve sharedlib and hot deploy directory relative to GERONIMO_BASE

Modified:
    geronimo/server/trunk/modules/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java

Modified: geronimo/server/trunk/modules/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java?view=diff&rev=527482&r1=527481&r2=527482
==============================================================================
--- geronimo/server/trunk/modules/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java
(original)
+++ geronimo/server/trunk/modules/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java
Wed Apr 11 06:06:45 2007
@@ -145,7 +145,7 @@
         if (factory == null) {
             factory = new DeploymentFactoryWithKernel(kernel);
         }
-        File dir = serverInfo.resolve(path);
+        File dir = serverInfo.resolveServer(path);
         if (!dir.exists()) {
             if (!dir.mkdirs()) {
                 throw new IllegalStateException("Hot deploy directory " + dir.getAbsolutePath()
+ " does not exist and cannot be created!");

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java?view=diff&rev=527482&r1=527481&r2=527482
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/sharedlib/SharedLib.java
Wed Apr 11 06:06:45 2007
@@ -46,7 +46,7 @@
         if (classesDirs != null) {
             for (int i = 0; i < classesDirs.length; i++) {
                 String classesDir = classesDirs[i];
-                File dir = serverInfo.resolve(classesDir);
+                File dir = serverInfo.resolveServer(classesDir);
                 if (!dir.exists()) {
                     if (!dir.mkdirs()) {
                         throw new IllegalArgumentException("Failed to create classes dir:
" + dir);
@@ -65,7 +65,7 @@
         if (libDirs != null) {
             for (int i = 0; i < libDirs.length; i++) {
                 String libDir = libDirs[i];
-                File dir = serverInfo.resolve(libDir);
+                File dir = serverInfo.resolveServer(libDir);
                 if (!dir.exists()) {
                     if (!dir.mkdirs()) {
                         throw new IllegalArgumentException("Failed to create lib dir: " +
dir);



Mime
View raw message