shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lhazlew...@apache.org
Subject svn commit: r811132 - /incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/IniConfiguration.java
Date Thu, 03 Sep 2009 21:30:11 GMT
Author: lhazlewood
Date: Thu Sep  3 21:30:10 2009
New Revision: 811132

URL: http://svn.apache.org/viewvc?rev=811132&view=rev
Log:
SHIRO-10: removed 'sm' alias - no other aliases exist and end-users cannot define their own
alias.  It should be removed as a feature (it was previously undocumented anyway).  Configuration
mechanisms will also change for 1.0 probably making this an irrelevant issue.

Modified:
    incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/IniConfiguration.java

Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/IniConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/IniConfiguration.java?rev=811132&r1=811131&r2=811132&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/IniConfiguration.java
(original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/IniConfiguration.java
Thu Sep  3 21:30:10 2009
@@ -18,18 +18,6 @@
  */
 package org.apache.shiro.config;
 
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Scanner;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.apache.shiro.ShiroException;
 import org.apache.shiro.io.IniResource;
 import org.apache.shiro.io.ResourceUtils;
@@ -39,6 +27,12 @@
 import org.apache.shiro.realm.Realm;
 import org.apache.shiro.realm.RealmFactory;
 import org.apache.shiro.util.LifecycleUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.util.*;
 
 
 /**
@@ -88,8 +82,7 @@
         this.configUrl = configUrl;
     }
 
-    public void init() throws ShiroException
-    {
+    public void init() throws ShiroException {
 
         if (configUrl != null) {
             if (ResourceUtils.resourceExists(configUrl)) {
@@ -192,8 +185,7 @@
 
         RealmSecurityManager securityManager = newSecurityManagerInstance();
         defaults.put("securityManager", securityManager);
-        //convenient alias:
-        defaults.put("sm", securityManager);
+
         ReflectionBuilder builder = new ReflectionBuilder(defaults);
         Map<String, Object> objects = builder.buildObjects(mainSection);
 



Mime
View raw message