geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r531311 - in /geronimo/server/trunk/modules: geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
Date Mon, 23 Apr 2007 01:33:02 GMT
Author: akulshreshtha
Date: Sun Apr 22 18:33:01 2007
New Revision: 531311

URL: http://svn.apache.org/viewvc?view=rev&rev=531311
Log:
GERONIMO-3011 Resolve artifact_aliases.properties and keystores relative to GERONIMO_BASE

Modified:
    geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java

Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java?view=diff&rev=531311&r1=531310&r2=531311
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
(original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
Sun Apr 22 18:33:01 2007
@@ -88,7 +88,7 @@
     public void doStart() throws Exception {
         URI rootURI;
         if (serverInfo != null) {
-            rootURI = serverInfo.resolve(configuredDir);
+            rootURI = serverInfo.resolveServer(configuredDir);
         } else {
             rootURI = configuredDir;
         }

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java?view=diff&rev=531311&r1=531310&r2=531311
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
Sun Apr 22 18:33:01 2007
@@ -51,7 +51,7 @@
         if (versionMapLocation == null) {
             return null;
         }
-        File location = serverInfo == null? new File(versionMapLocation): serverInfo.resolve(versionMapLocation);
+        File location = serverInfo == null? new File(versionMapLocation): serverInfo.resolveServer(versionMapLocation);
         FileInputStream in = new FileInputStream(location);
         Properties properties = new Properties();
         try {



Mime
View raw message