click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From med...@apache.org
Subject svn commit: r777036 - in /incubator/click/trunk/click: ./ build/ documentation/docs/ documentation/docs/developer-guide/ framework/src/EDU/oswego/cs/dl/util/concurrent/ framework/src/org/apache/click/util/
Date Thu, 21 May 2009 09:58:16 GMT
Author: medgar
Date: Thu May 21 09:58:16 2009
New Revision: 777036

URL: http://svn.apache.org/viewvc?rev=777036&view=rev
Log:
Replaced Doug Lee ConcurrentReaderHashMap with Java 1.5 ConcurrentHashMap

Removed:
    incubator/click/trunk/click/framework/src/EDU/oswego/cs/dl/util/concurrent/
Modified:
    incubator/click/trunk/click/NOTICE.txt
    incubator/click/trunk/click/build/build.xml
    incubator/click/trunk/click/documentation/docs/click.html
    incubator/click/trunk/click/documentation/docs/developer-guide/building.html
    incubator/click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java

Modified: incubator/click/trunk/click/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/NOTICE.txt?rev=777036&r1=777035&r2=777036&view=diff
==============================================================================
--- incubator/click/trunk/click/NOTICE.txt (original)
+++ incubator/click/trunk/click/NOTICE.txt Thu May 21 09:58:16 2009
@@ -12,26 +12,6 @@
 
 ======================================================================
 
-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 contributions by Ahmed Mohombe and Christian Essl,
 released under the Apache 2.0 license.
 

Modified: incubator/click/trunk/click/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/build/build.xml?rev=777036&r1=777035&r2=777036&view=diff
==============================================================================
--- incubator/click/trunk/click/build/build.xml (original)
+++ incubator/click/trunk/click/build/build.xml Thu May 21 09:58:16 2009
@@ -216,20 +216,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"
@@ -303,12 +295,6 @@
       <property name="dir.classes" value="framework/classes"/>
       <delete dir="${dir.classes}" quiet="false"/>
       <mkdir dir="${dir.classes}"/>
-      <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"/>
  	  <copy file="NOTICE.txt" todir="${dir.classes}/META-INF"/>
     <copy file="DISCLAIMER.txt" todir="${dir.classes}/META-INF"/>

Modified: incubator/click/trunk/click/documentation/docs/click.html
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/documentation/docs/click.html?rev=777036&r1=777035&r2=777036&view=diff
==============================================================================
--- incubator/click/trunk/click/documentation/docs/click.html (original)
+++ incubator/click/trunk/click/documentation/docs/click.html Thu May 21 09:58:16 2009
@@ -68,7 +68,7 @@
  <li class="item">Automatic form rendering and client/server side validation</li>
  <li class="item">Supports Velocity, JSP or FreeMarker page rendering</li>
  <li class="item">Free Open Source with commercial friendly Apache License</li>
- <li class="item">Supports JDK 1.4 and later</li>
+ <li class="item">Supports JDK 1.5 and later</li>
 </ul>
 <p/>
 The design philosophy behind Click is best summarized in the Swedish word 

Modified: incubator/click/trunk/click/documentation/docs/developer-guide/building.html
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/documentation/docs/developer-guide/building.html?rev=777036&r1=777035&r2=777036&view=diff
==============================================================================
--- incubator/click/trunk/click/documentation/docs/developer-guide/building.html (original)
+++ incubator/click/trunk/click/documentation/docs/developer-guide/building.html Thu May 21
09:58:16 2009
@@ -279,13 +279,6 @@
   <td><a target="_blank" href="http://jakarta.apache.org/commons/">Jakarta Commons</a></td>
   <td>IO Utilities Library</td>
 </tr>
-<tr>
-  <td>Concurrent</td>
-  <td>1.3.4</td>
-  <td>ConcurrentReaderHashMap class<span class="red">*</span></td>
-  <td><a target="_blank" href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html">Doug
Lea</a></td>
-  <td>Concurrent utilities library</td>
-</tr>
 </table>
 
 <span class="red">*</span> : marked JAR libraries or Java source are included
in the 

Modified: incubator/click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java?rev=777036&r1=777035&r2=777036&view=diff
==============================================================================
--- incubator/click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java (original)
+++ incubator/click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java Thu
May 21 09:58:16 2009
@@ -20,8 +20,7 @@
 
 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;
@@ -34,10 +33,10 @@
 public class PropertyUtils {
 
     /** Provides a synchronized cache of OGNL expressions. */
-    private static final Map OGNL_EXPRESSION_CACHE = new ConcurrentReaderHashMap();
+    private static final Map OGNL_EXPRESSION_CACHE = new ConcurrentHashMap();
 
     /** Provides a synchronized cache of get value reflection methods. */
-    private static final Map GET_METHOD_CACHE = new ConcurrentReaderHashMap();
+    private static final Map GET_METHOD_CACHE = new ConcurrentHashMap();
 
     // -------------------------------------------------------- Public Methods
 



Mime
View raw message