[jboss-svn-commits] JBoss Common SVN: r2481 - in jbossxb/trunk: src/main/java/org/jboss/xb/binding/introspection and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2007-08-10 11:58:03 -0400 (Fri, 10 Aug 2007)
New Revision: 2481

Modified:
   jbossxb/trunk/pom.xml
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/introspection/ClassInfo.java
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/introspection/ClassInfos.java
   jbossxb/trunk/src/test/java/org/jboss/test/xml/pojoserver/metadata/AbstractFeatureMetaData.java
Log:
JBXB-105 remove dependency on the oswego concurrent

Modified: jbossxb/trunk/pom.xml
===================================================================
--- jbossxb/trunk/pom.xml	2007-08-10 13:57:29 UTC (rev 2480)
+++ jbossxb/trunk/pom.xml	2007-08-10 15:58:03 UTC (rev 2481)
@@ -99,12 +99,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>oswego-concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-      <version>1.3.4</version>
-      <scope>compile</scope>
-    </dependency> 
-    <dependency>
       <groupId>apache-xerces</groupId>
       <artifactId>xercesImpl</artifactId>
       <version>2.7.1</version>

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/introspection/ClassInfo.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/introspection/ClassInfo.java	2007-08-10 13:57:29 UTC (rev 2480)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/introspection/ClassInfo.java	2007-08-10 15:58:03 UTC (rev 2481)
@@ -26,8 +26,9 @@
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.jboss.xb.binding.JBossXBRuntimeException;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/introspection/ClassInfos.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/introspection/ClassInfos.java	2007-08-10 13:57:29 UTC (rev 2480)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/introspection/ClassInfos.java	2007-08-10 15:58:03 UTC (rev 2481)
@@ -23,11 +23,12 @@
 
 import java.util.Map;
 import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.lang.ref.WeakReference;
 import org.jboss.xb.binding.JBossXBRuntimeException;
 import org.jboss.xb.util.NoopMap;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
 
+
 /**
  * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
  * @version <tt>$Revision: $</tt>

Modified: jbossxb/trunk/src/test/java/org/jboss/test/xml/pojoserver/metadata/AbstractFeatureMetaData.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xml/pojoserver/metadata/AbstractFeatureMetaData.java	2007-08-10 13:57:29 UTC (rev 2480)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xml/pojoserver/metadata/AbstractFeatureMetaData.java	2007-08-10 15:58:03 UTC (rev 2481)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 import java.util.Iterator;
+import java.util.concurrent.ConcurrentHashMap;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
 
 /**
  * @author Scott.Stark at jboss.org
@@ -71,7 +71,7 @@
    public void setValue(String key, Object value)
    {
       if (values == null)
-         values = new ConcurrentReaderHashMap();
+         values = new ConcurrentHashMap();
       values.put(key, value);
    }