svn commit: r733419 - in /incubator/jsecurity/trunk: NOTICE.txt core/src/org/jsecurity/authc/AuthenticationInfo.java core/src/org/jsecurity/authz/AuthorizationInfo.java core/src/org/jsecurity/util/SoftHashMap.java jsecurity.ipr

[lh...@apache.org]

Author: lhazlewood
Date: Sat Jan 10 22:23:31 2009
New Revision: 733419

URL: http://svn.apache.org/viewvc?rev=733419&view=rev
Log:
JSEC-39 - had AuthenticationInfo and AuthorizationInfo extend Serializable.  Also updated the NOTICE file to reflect Dr. Heinz Kabut's permission for us to use his source code to seed our SoftHashMap implementation.

Modified:
    incubator/jsecurity/trunk/NOTICE.txt
    incubator/jsecurity/trunk/core/src/org/jsecurity/authc/AuthenticationInfo.java
    incubator/jsecurity/trunk/core/src/org/jsecurity/authz/AuthorizationInfo.java
    incubator/jsecurity/trunk/core/src/org/jsecurity/util/SoftHashMap.java
    incubator/jsecurity/trunk/jsecurity.ipr

Modified: incubator/jsecurity/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/NOTICE.txt?rev=733419&r1=733418&r2=733419&view=diff
==============================================================================
--- incubator/jsecurity/trunk/NOTICE.txt (original)
+++ incubator/jsecurity/trunk/NOTICE.txt Sat Jan 10 22:23:31 2009
@@ -3,3 +3,14 @@
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
+
+This product includes a org.jsecurity.util.SoftHashMap
+implementation based on initial ideas from Dr. Hienz Kabutz's
+public posted version found here:
+    http://www.javaspecialists.eu/archive/Issue015.html)
+with continued modifications.  Per Heinz Kabutz: "you have my
+express permission to publish it in Apache JSecurity - please
+leave a link in the source code pointing to my website:
+    http://www.javaspecialists.eu
+
+

Modified: incubator/jsecurity/trunk/core/src/org/jsecurity/authc/AuthenticationInfo.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/jsecurity/authc/AuthenticationInfo.java?rev=733419&r1=733418&r2=733419&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/jsecurity/authc/AuthenticationInfo.java (original)
+++ incubator/jsecurity/trunk/core/src/org/jsecurity/authc/AuthenticationInfo.java Sat Jan 10 22:23:31 2009
@@ -21,6 +21,8 @@
 
 import org.jsecurity.subject.PrincipalCollection;
 
+import java.io.Serializable;
+
 /**
  * <code>AuthenticationInfo</code> represents a Subject's (aka user's) stored account information relevant to the
  * authentication/log-in process only.
@@ -55,7 +57,7 @@
  * @see Account
  * @since 0.9
  */
-public interface AuthenticationInfo {
+public interface AuthenticationInfo extends Serializable {
 
     /**
      * Returns all principals associated with the corresponding Subject.  Each principal is an identifying piece of

Modified: incubator/jsecurity/trunk/core/src/org/jsecurity/authz/AuthorizationInfo.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/jsecurity/authz/AuthorizationInfo.java?rev=733419&r1=733418&r2=733419&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/jsecurity/authz/AuthorizationInfo.java (original)
+++ incubator/jsecurity/trunk/core/src/org/jsecurity/authz/AuthorizationInfo.java Sat Jan 10 22:23:31 2009
@@ -18,6 +18,7 @@
  */
 package org.jsecurity.authz;
 
+import java.io.Serializable;
 import java.util.Collection;
 
 /**
@@ -56,7 +57,7 @@
  * @see org.jsecurity.authc.Account
  * @since 0.9
  */
-public interface AuthorizationInfo {
+public interface AuthorizationInfo extends Serializable {
 
     /**
      * Returns the names of all roles assigned to a corresponding Subject.

Modified: incubator/jsecurity/trunk/core/src/org/jsecurity/util/SoftHashMap.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/jsecurity/util/SoftHashMap.java?rev=733419&r1=733418&r2=733419&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/jsecurity/util/SoftHashMap.java (original)
+++ incubator/jsecurity/trunk/core/src/org/jsecurity/util/SoftHashMap.java Sat Jan 10 22:23:31 2009
@@ -140,17 +140,14 @@
     public V put(K key, V value) {
         processQueue(); // throw out garbage collected values first
         SoftValue<V, K> sv = new SoftValue<V, K>(value, key, queue);
-        return map.put(key, sv).get();
+        SoftValue<V, K> previous = map.put(key, sv);
+        return previous != null ? previous.get() : null;
     }
 
     public V remove(Object key) {
         processQueue(); // throw out garbage collected values first
         SoftValue<V, K> raw = map.remove(key);
-        V removed = null;
-        if (raw != null) {
-            removed = raw.get();
-        }
-        return removed;
+        return raw != null ? raw.get() : null;
     }
 
     public void clear() {

Modified: incubator/jsecurity/trunk/jsecurity.ipr
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/jsecurity.ipr?rev=733419&r1=733418&r2=733419&view=diff
==============================================================================
--- incubator/jsecurity/trunk/jsecurity.ipr (original)
+++ incubator/jsecurity/trunk/jsecurity.ipr Sat Jan 10 22:23:31 2009
@@ -528,9 +528,12 @@
       <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
     </library>
     <library name="quickstart-libs">
-      <CLASSES />
+      <CLASSES>
+        <root url="file://$PROJECT_DIR$/lib/samples" />
+      </CLASSES>
       <JAVADOC />
       <SOURCES />
+      <jarDirectory url="file://$PROJECT_DIR$/lib/samples" recursive="false" />
     </library>
   </component>
 </project>