svn commit: r1565551 - in /incubator/kalumet/trunk: assembly/pom.xml assembly/src/main/descriptors/agent-bin.xml kalumet-modules/common/pom.xml kalumet-modules/common/src/main/java/org/apache/kalumet/model/log/Journal.java pom.xml

[ol...@apache.org]

Author: olamy
Date: Fri Feb  7 06:39:40 2014
New Revision: 1565551

URL: http://svn.apache.org/r1565551
Log:
use java concurent librairies

Modified:
    incubator/kalumet/trunk/assembly/pom.xml
    incubator/kalumet/trunk/assembly/src/main/descriptors/agent-bin.xml
    incubator/kalumet/trunk/kalumet-modules/common/pom.xml
    incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/log/Journal.java
    incubator/kalumet/trunk/pom.xml

Modified: incubator/kalumet/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/assembly/pom.xml?rev=1565551&r1=1565550&r2=1565551&view=diff
==============================================================================
--- incubator/kalumet/trunk/assembly/pom.xml (original)
+++ incubator/kalumet/trunk/assembly/pom.xml Fri Feb  7 06:39:40 2014
@@ -102,10 +102,6 @@
       <artifactId>commons-vfs</artifactId>
     </dependency>
     <dependency>
-      <groupId>concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-    </dependency>
-    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>

Modified: incubator/kalumet/trunk/assembly/src/main/descriptors/agent-bin.xml
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/assembly/src/main/descriptors/agent-bin.xml?rev=1565551&r1=1565550&r2=1565551&view=diff
==============================================================================
--- incubator/kalumet/trunk/assembly/src/main/descriptors/agent-bin.xml (original)
+++ incubator/kalumet/trunk/assembly/src/main/descriptors/agent-bin.xml Fri Feb  7 06:39:40 2014
@@ -76,7 +76,6 @@
         <include>org.apache.commons:commons-email</include>
         <include>commons-lang:commons-lang</include>
         <include>commons-discovery:commons-discovery</include>
-        <include>concurrent:concurrent</include>
         <include>opensymphony:quartz</include>
         <include>oro:oro</include>
         <include>xml-apis:xml-apis</include>

Modified: incubator/kalumet/trunk/kalumet-modules/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/pom.xml?rev=1565551&r1=1565550&r2=1565551&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/pom.xml (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/pom.xml Fri Feb  7 06:39:40 2014
@@ -43,10 +43,6 @@
       <artifactId>axis</artifactId>
     </dependency>
     <dependency>
-      <groupId>concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
     </dependency>

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/log/Journal.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/log/Journal.java?rev=1565551&r1=1565550&r2=1565551&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/log/Journal.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/log/Journal.java Fri Feb  7 06:39:40 2014
@@ -18,7 +18,6 @@
  */
 package org.apache.kalumet.model.log;
 
-import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock;
 import org.apache.commons.digester.Digester;
 import org.apache.kalumet.KalumetException;
 import org.apache.xerces.dom.CoreDocumentImpl;
@@ -32,6 +31,7 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
  * Manages the environment log file and represents the <code>journal</code>
@@ -42,7 +42,7 @@ public class Journal
 
   private LinkedList events;
 
-  private WriterPreferenceReadWriteLock lock = new WriterPreferenceReadWriteLock();
+  private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
   public Journal()
   {
@@ -151,7 +151,7 @@ public class Journal
   {
     try
     {
-      lock.writeLock().acquire();
+      lock.writeLock().lock();
       OutputFormat format = new OutputFormat();
       format.setLineWidth( 72 );
       format.setIndenting( true );
@@ -174,7 +174,7 @@ public class Journal
     }
     finally
     {
-      lock.writeLock().release();
+      lock.writeLock().unlock();
     }
   }
 

Modified: incubator/kalumet/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/pom.xml?rev=1565551&r1=1565550&r2=1565551&view=diff
==============================================================================
--- incubator/kalumet/trunk/pom.xml (original)
+++ incubator/kalumet/trunk/pom.xml Fri Feb  7 06:39:40 2014
@@ -153,7 +153,6 @@
     <axis.version>1.4</axis.version>
     <axis-wsdl4j.version>1.5.1</axis-wsdl4j.version>
     <classworlds.version>1.1</classworlds.version>
-    <concurrent.version>1.3.4</concurrent.version>
     <commons-beanutils.version>1.8.3</commons-beanutils.version>
     <commons-cli.version>1.2</commons-cli.version>
     <commons-codec.version>1.5</commons-codec.version>
@@ -237,11 +236,6 @@
         <version>${classworlds.version}</version>
       </dependency>
       <dependency>
-        <groupId>concurrent</groupId>
-        <artifactId>concurrent</artifactId>
-        <version>${concurrent.version}</version>
-      </dependency>
-      <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
         <version>${commons-beanutils.version}</version>