Author: olamy
Date: Fri Feb 7 06:50:54 2014
New Revision: 1565553
URL: http://svn.apache.org/r1565553
Log:
upgrade slf4j
Modified:
incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/FileManipulator.java
incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java
incubator/kalumet/trunk/pom.xml
Modified:
incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/FileManipulator.java
URL:
http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/FileManipulator.java?rev=1565553&r1=1565552&r2=1565553&view=diff
==============================================================================
---
incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/FileManipulator.java
(original)
+++
incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/FileManipulator.java
Fri Feb 7 06:50:54 2014
@@ -412,7 +412,7 @@ public class FileManipulator
}
else
{
- LOGGER.debug( "Source {} is a file" );
+ LOGGER.debug( "Source {} is a file", src );
if ( destFile.exists() && destFile.getType().equals( FileType.FOLDER )
)
{
destFile = this.resolveFile( dest + "/" +
srcFile.getName().getBaseName() );
Modified:
incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java
URL:
http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java?rev=1565553&r1=1565552&r2=1565553&view=diff
==============================================================================
---
incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java
(original)
+++
incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java
Fri Feb 7 06:50:54 2014
@@ -18,7 +18,6 @@
*/
package org.apache.kalumet.model;
-import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock;
import org.apache.commons.digester.Digester;
import org.apache.kalumet.FileManipulator;
import org.apache.kalumet.KalumetException;
@@ -35,6 +34,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* Represents the <code>kalumet</code> root tag in the main Kalumet DOM.
@@ -45,7 +45,7 @@ public class Kalumet
private static final long serialVersionUID = -3237352886418250595L;
- private static WriterPreferenceReadWriteLock lock = new
WriterPreferenceReadWriteLock();
+ private static ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
private LinkedList properties;
@@ -358,7 +358,7 @@ public class Kalumet
Kalumet kalumet = null;
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
// init the digester with no validation on the XML file (no DTD)
Digester digester = new Digester();
@@ -831,7 +831,7 @@ public class Kalumet
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
return kalumet;
}
@@ -923,7 +923,7 @@ public class Kalumet
}
try
{
- lock.writeLock().acquire();
+ lock.writeLock().lock();
OutputFormat format = new OutputFormat();
format.setLineWidth( 72 );
format.setIndenting( true );
@@ -946,7 +946,7 @@ public class Kalumet
}
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=1565553&r1=1565552&r2=1565553&view=diff
==============================================================================
--- incubator/kalumet/trunk/pom.xml (original)
+++ incubator/kalumet/trunk/pom.xml Fri Feb 7 06:50:54 2014
@@ -173,7 +173,7 @@
<log4j.version>1.2.16</log4j.version>
<oro.version>2.0.8</oro.version>
<quartz.version>1.6.3</quartz.version>
- <slf4j.version>1.6.3</slf4j.version>
+ <slf4j.version>1.7.6</slf4j.version>
<xalan.version>2.7.1</xalan.version>
<xerces.version>2.9.1</xerces.version>
<xml-apis.version>2.0.2</xml-apis.version>
