geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r530206 - /geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java
Date Wed, 18 Apr 2007 23:53:04 GMT
Author: akulshreshtha
Date: Wed Apr 18 16:53:03 2007
New Revision: 530206

URL: http://svn.apache.org/viewvc?view=rev&rev=530206
Log:
GERONIMO-3011 Resolve UsersURI and GroupsURI relative to GERONIMO_BASE

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java

Modified: geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java?view=diff&rev=530206&r1=530205&r2=530206
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java
Wed Apr 18 16:53:03 2007
@@ -69,7 +69,7 @@
         users.clear();
         InputStream in = null;
         try {
-            in = serverInfo.resolve(getUsersURI()).toURL().openStream();
+            in = serverInfo.resolveServer(getUsersURI()).toURL().openStream();
             users.load(in);
         } catch (Exception e) {
             throw new GeronimoSecurityException(e);
@@ -88,7 +88,7 @@
         groups.clear();
         InputStream in = null;
         try {
-            in = serverInfo.resolve(getGroupsURI()).toURL().openStream();
+            in = serverInfo.resolveServer(getGroupsURI()).toURL().openStream();
             groups.load(in);
         } catch (Exception e) {
             throw new GeronimoSecurityException(e);
@@ -107,7 +107,7 @@
         users.clear();
         InputStream in = null;
         try {
-            in = serverInfo.resolve(getUsersURI()).toURL().openStream();
+            in = serverInfo.resolveServer(getUsersURI()).toURL().openStream();
             users.load(in);
         } catch (Exception e) {
             throw new GeronimoSecurityException(e);
@@ -127,7 +127,7 @@
         groups.clear();
         InputStream in = null;
         try {
-            in = serverInfo.resolve(getGroupsURI()).toURL().openStream();
+            in = serverInfo.resolveServer(getGroupsURI()).toURL().openStream();
             groups.load(in);
         } catch (Exception e) {
             throw new GeronimoSecurityException(e);
@@ -158,7 +158,7 @@
                 password = digestPassword(password, digest);
             }
             users.setProperty(user, password);
-            store(users, serverInfo.resolve(getUsersURI()).toURL());
+            store(users, serverInfo.resolveServer(getUsersURI()).toURL());
         } catch (Exception e) {
             throw new GeronimoSecurityException("Cannot add user principal: "
                     + e.getMessage());
@@ -170,7 +170,7 @@
         try {
             refreshUsers();
             users.remove(userPrincipal);
-            store(users, serverInfo.resolve(getUsersURI()).toURL());
+            store(users, serverInfo.resolveServer(getUsersURI()).toURL());
         } catch (Exception e) {
             throw new GeronimoSecurityException("Cannot remove user principal "
                     + userPrincipal + ": " + e.getMessage());
@@ -189,7 +189,7 @@
                 password = digestPassword(password, digest);
             }
             users.setProperty(user, password);
-            store(users, serverInfo.resolve(getUsersURI()).toURL());
+            store(users, serverInfo.resolveServer(getUsersURI()).toURL());
         } catch (Exception e) {
             throw new GeronimoSecurityException("Cannot add user principal: "
                     + e.getMessage());
@@ -206,7 +206,7 @@
         try {
             groups.setProperty((String) properties.get("GroupName"),
                     (String) properties.get("Members"));
-            store(groups, serverInfo.resolve(getGroupsURI()).toURL());
+            store(groups, serverInfo.resolveServer(getGroupsURI()).toURL());
         } catch (Exception e) {
             throw new GeronimoSecurityException("Cannot add group principal: "
                     + e.getMessage());
@@ -218,7 +218,7 @@
         refreshGroups();
         try {
             groups.remove(groupPrincipal);
-            store(groups, serverInfo.resolve(getGroupsURI()).toURL());
+            store(groups, serverInfo.resolveServer(getGroupsURI()).toURL());
         } catch (Exception e) {
             throw new GeronimoSecurityException(
                     "Cannot remove group principal: " + e.getMessage());
@@ -232,7 +232,7 @@
         try {
             groups.setProperty((String) properties.get("GroupName"),
                     (String) properties.get("Members"));
-            store(groups, serverInfo.resolve(getGroupsURI()).toURL());
+            store(groups, serverInfo.resolveServer(getGroupsURI()).toURL());
         } catch (Exception e) {
             throw new GeronimoSecurityException("Cannot add group principal: "
                     + e.getMessage());



Mime
View raw message