click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r955536 - in /click/trunk/click: LICENSE.txt NOTICE.txt build/build.xml framework/src/EDU/ framework/src/org/apache/click/util/PropertyUtils.java
Date Thu, 17 Jun 2010 10:15:14 GMT
Author: sabob
Date: Thu Jun 17 10:15:14 2010
New Revision: 955536

URL: http://svn.apache.org/viewvc?rev=955536&view=rev
Log:
Replaced EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap with java.util.concurrent.ConcurrentHashMap.
CLK-636

Removed:
    click/trunk/click/framework/src/EDU/
Modified:
    click/trunk/click/LICENSE.txt
    click/trunk/click/NOTICE.txt
    click/trunk/click/build/build.xml
    click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java

Modified: click/trunk/click/LICENSE.txt
URL: http://svn.apache.org/viewvc/click/trunk/click/LICENSE.txt?rev=955536&r1=955535&r2=955536&view=diff
==============================================================================
--- click/trunk/click/LICENSE.txt (original)
+++ click/trunk/click/LICENSE.txt Thu Jun 17 10:15:14 2010
@@ -213,24 +213,6 @@ DAMAGE.
 
 ======================================================================
 
-CONCURRENCY UTILITIES
-
-EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap[1] is taken
-from [2], which states the following:
-
-      "All classes are released to the public domain and may be used for
-      any purpose whatsoever without permission or acknowledgment.
-      Portions of the CopyOnWriteArrayList and ConcurrentReaderHashMap
-      classes are adapted from Sun JDK source code. These are copyright
-      of Sun Microsystems, Inc, and are used with their kind permission,
-      as described in this license[3]."
-
-[1]: http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/ConcurrentReaderHashMap.java
-[2]: http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
-[3]: http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf
-
-======================================================================
-
 COOKIE UTILS - Seraph project (BSD License)
 
 Copyright (c) 2007 - Atlassian Software Systems Pty Ltd

Modified: click/trunk/click/NOTICE.txt
URL: http://svn.apache.org/viewvc/click/trunk/click/NOTICE.txt?rev=955536&r1=955535&r2=955536&view=diff
==============================================================================
--- click/trunk/click/NOTICE.txt (original)
+++ click/trunk/click/NOTICE.txt Thu Jun 17 10:15:14 2010
@@ -8,24 +8,6 @@ This product includes the OGNL library, 
 released under the BSD License.
 http://www.ognl.org/
 
-This product includes the compiled classes
-framework/src/EDU/oswego/cs/dl/util/concurrent/ConcurrentReaderHashMap*.class,
-from the Concurrent utilities library, developed by Doug Lea.
-
-EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap[1] is taken
-from [2], which states the following:
-
-      "All classes are released to the public domain and may be used for
-      any purpose whatsoever without permission or acknowledgment.
-      Portions of the CopyOnWriteArrayList and ConcurrentReaderHashMap
-      classes are adapted from Sun JDK source code. These are copyright
-      of Sun Microsystems, Inc, and are used with their kind permission,
-      as described in this license[3]."
-
-[1]: http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/ConcurrentReaderHashMap.java
-[2]: http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
-[3]: http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf
-
 This product includes software from the Seraph project developed by Atlassian
 and released under the BSD License.
 http://www.atlassian.com/

Modified: click/trunk/click/build/build.xml
URL: http://svn.apache.org/viewvc/click/trunk/click/build/build.xml?rev=955536&r1=955535&r2=955536&view=diff
==============================================================================
--- click/trunk/click/build/build.xml (original)
+++ click/trunk/click/build/build.xml Thu Jun 17 10:15:14 2010
@@ -203,20 +203,12 @@
             <exclude name="**/classes/**"/>
             <exclude name="**/WEB-INF/lib/**"/>
             <exclude name="examples/webapp/javadoc/**"/>
-            <exclude name="**/EDU/oswego/cs/dl/util/concurrent/*.java"/>
             <exclude name="documentation/xdocs/lib/**"/>
             <exclude name="documentation/xdocs/target/**"/>
             <exclude name="documentation/xdocs/click-docbook/**"/>
          </fileset>
       </copy>
 
-      <!-- Copy ConcurrentReaderHashMap class to src folder -->
-      <copy todir="${click}/framework/src">
-          <fileset dir="framework/classes" casesensitive="yes">
-            <include name="EDU/oswego/cs/dl/util/concurrent/*.class"/>
-          </fileset>
-      </copy>
-
       <delete file="../${click}.zip"/>
       <zip basedir="."
            destfile="../${click}.zip"
@@ -292,7 +284,6 @@
       <copy todir="${dir.classes}">
          <fileset dir="${dir.source}">
             <exclude name="**/package.html"/>
-            <exclude name="EDU/oswego/cs/dl/util/concurrent/*.java"/>
          </fileset>
       </copy>
  	  <copy file="LICENSE.txt" todir="${dir.classes}/META-INF"/>

Modified: click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java?rev=955536&r1=955535&r2=955536&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java (original)
+++ click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java Thu Jun 17 10:15:14
2010
@@ -20,8 +20,7 @@ package org.apache.click.util;
 
 import java.lang.reflect.Method;
 import java.util.Map;
-
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 import ognl.Ognl;
 import ognl.OgnlException;
@@ -33,10 +32,10 @@ import ognl.OgnlException;
 public class PropertyUtils {
 
     /** Provides a synchronized cache of OGNL expressions. */
-    private static final Map OGNL_EXPRESSION_CACHE = new ConcurrentReaderHashMap();
+    private static final Map<String, Object> OGNL_EXPRESSION_CACHE = new ConcurrentHashMap<String,
Object>();
 
     /** Provides a synchronized cache of get value reflection methods. */
-    private static final Map GET_METHOD_CACHE = new ConcurrentReaderHashMap();
+    private static final Map<String, Object> GET_METHOD_CACHE = new ConcurrentHashMap<String,
Object>();
 
     // -------------------------------------------------------- Public Methods
 
@@ -276,6 +275,7 @@ public class PropertyUtils {
          * @param o the object with which to compare this instance with
          * @return true if the specified object is the same as this object
          */
+        @Override
         public final boolean equals(Object o) {
             if (this == o) {
                 return true;
@@ -299,6 +299,7 @@ public class PropertyUtils {
          *
          * @return a hash code value for this object.
          */
+        @Override
         public final int hashCode() {
             return sourceClass.hashCode() * 31 + property.hashCode();
         }



Mime
View raw message