10:53 a.m.
Author: julien(a)jboss.com
Date: 2008-02-24 11:53:47 -0500 (Sun, 24 Feb 2008)
New Revision: 10095
Modified:
modules/common/trunk/build/pom.xml
modules/common/trunk/common/pom.xml
modules/common/trunk/common/src/main/java/org/jboss/portal/common/i18n/CachingLocaleFormat.java
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ValveTestCase.java
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/io/IOToolsTestCase.java
Log:
JBPORTAL-1923 : Replace oswego by java.util.concurrent
Modified: modules/common/trunk/build/pom.xml
===================================================================
--- modules/common/trunk/build/pom.xml 2008-02-23 00:17:20 UTC (rev 10094)
+++ modules/common/trunk/build/pom.xml 2008-02-24 16:53:47 UTC (rev 10095)
@@ -15,12 +15,10 @@
<properties>
<version.activation>1.1</version.activation>
- <version.concurrent>1.3.4</version.concurrent>
<version.javax.servlet>2.4</version.javax.servlet>
<version.jboss-j2ee>4.2.0.GA</version.jboss-j2ee>
<version.jboss-jmx>4.2.0.GA</version.jboss-jmx>
<version.jboss-system>4.2.0.GA</version.jboss-system>
-
<version.jboss-backport-concurrent>2.1.0.GA</version.jboss-backport-concurrent>
<version.jboss-common-core>2.2.0.GA</version.jboss-common-core>
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
@@ -71,12 +69,6 @@
</dependency>
<dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>${version.concurrent}</version>
- </dependency>
-
- <dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${version.activation}</version>
@@ -119,12 +111,6 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-backport-concurrent</artifactId>
- <version>${version.jboss-backport-concurrent}</version>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${version.javax.servlet}</version>
Modified: modules/common/trunk/common/pom.xml
===================================================================
--- modules/common/trunk/common/pom.xml 2008-02-23 00:17:20 UTC (rev 10094)
+++ modules/common/trunk/common/pom.xml 2008-02-24 16:53:47 UTC (rev 10095)
@@ -19,11 +19,6 @@
</dependency>
<dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- </dependency>
-
- <dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
@@ -59,11 +54,6 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-backport-concurrent</artifactId>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
Modified:
modules/common/trunk/common/src/main/java/org/jboss/portal/common/i18n/CachingLocaleFormat.java
===================================================================
---
modules/common/trunk/common/src/main/java/org/jboss/portal/common/i18n/CachingLocaleFormat.java 2008-02-23
00:17:20 UTC (rev 10094)
+++
modules/common/trunk/common/src/main/java/org/jboss/portal/common/i18n/CachingLocaleFormat.java 2008-02-24
16:53:47 UTC (rev 10095)
@@ -22,12 +22,12 @@
******************************************************************************/
package org.jboss.portal.common.i18n;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
import org.jboss.portal.common.util.ConversionException;
import org.jboss.portal.common.text.CharWriter;
import java.io.IOException;
import java.util.Locale;
+import java.util.concurrent.ConcurrentHashMap;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -40,10 +40,10 @@
private final LocaleFormat delegate;
/** . */
- private final ConcurrentHashMap localeCache;
+ private final ConcurrentHashMap<String, Locale> localeCache;
/** . */
- private final ConcurrentHashMap stringCache;
+ private final ConcurrentHashMap<Locale, String> stringCache;
/**
* @param delegate the delegate when the cache value has not been found
@@ -56,13 +56,13 @@
throw new IllegalArgumentException("No null delegate is possible");
}
this.delegate = delegate;
- this.localeCache = new ConcurrentHashMap();
- this.stringCache = new ConcurrentHashMap();
+ this.localeCache = new ConcurrentHashMap<String, Locale>();
+ this.stringCache = new ConcurrentHashMap<Locale, String>();
}
public Locale getLocale(String value) throws ConversionException
{
- Locale locale = (Locale)localeCache.get(value);
+ Locale locale = localeCache.get(value);
//
if (locale != null)
@@ -81,7 +81,7 @@
public String toString(Locale locale) throws ConversionException
{
- String string = (String)stringCache.get(locale);
+ String string = stringCache.get(locale);
//
if (string != null)
Modified:
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ValveTestCase.java
===================================================================
---
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ValveTestCase.java 2008-02-23
00:17:20 UTC (rev 10094)
+++
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ValveTestCase.java 2008-02-24
16:53:47 UTC (rev 10095)
@@ -23,13 +23,13 @@
package org.jboss.portal.test.common;
import java.io.PrintStream;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.BrokenBarrierException;
import junit.framework.TestCase;
import org.jboss.portal.common.concurrent.Valve;
-import EDU.oswego.cs.dl.util.concurrent.CyclicBarrier;
-
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5451 $
@@ -135,11 +135,15 @@
assertTrue(valve.beforeInvocation());
// The valve is enterred
- barrier.barrier();
+ barrier.await();
// Wait
- barrier.barrier();
+ barrier.await();
}
+ catch (BrokenBarrierException e)
+ {
+ fail("" + e.getMessage());
+ }
catch (InterruptedException ignore)
{
}
@@ -149,8 +153,12 @@
try
{
// Tell the other thread we have finished
- barrier.barrier();
+ barrier.await();
}
+ catch (BrokenBarrierException e)
+ {
+ fail("" + e.getMessage());
+ }
catch (InterruptedException ignore)
{
}
@@ -163,7 +171,7 @@
thread.start();
// Wait until the thread called beforeInvocation
- barrier.barrier();
+ barrier.await();
// Attemtp to close
assertFalse(valve.closing(100));
@@ -172,10 +180,10 @@
assertEquals(Valve.CLOSING, valve.getState());
// Ask the invoker thread to finish
- barrier.barrier();
+ barrier.await();
// Wait until invocation is finished
- barrier.barrier();
+ barrier.await();
// Close, no thread are inside
valve.closing();
Modified:
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/io/IOToolsTestCase.java
===================================================================
---
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/io/IOToolsTestCase.java 2008-02-23
00:17:20 UTC (rev 10094)
+++
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/io/IOToolsTestCase.java 2008-02-24
16:53:47 UTC (rev 10095)
@@ -36,9 +36,8 @@
import java.io.CharArrayWriter;
import java.io.CharArrayReader;
import java.util.Random;
+import java.util.concurrent.atomic.AtomicBoolean;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
-
/**
* todo:
* <ul>
@@ -215,7 +214,7 @@
public void testOutputStreamSafeClose()
{
IOTools.safeClose((OutputStream)null);
- final SynchronizedBoolean called = new SynchronizedBoolean(false);
+ final AtomicBoolean called = new AtomicBoolean(false);
IOTools.safeClose(new AbstractOutputStream()
{
public void close() throws IOException
@@ -275,7 +274,7 @@
public void testInputStreamSafeClose()
{
IOTools.safeClose((InputStream)null);
- final SynchronizedBoolean called = new SynchronizedBoolean(false);
+ final AtomicBoolean called = new AtomicBoolean(false);
IOTools.safeClose(new AbstractInputStream()
{
public void close() throws IOException
@@ -336,7 +335,7 @@
public void testReaderSafeClose()
{
IOTools.safeClose((Reader)null);
- final SynchronizedBoolean called = new SynchronizedBoolean(false);
+ final AtomicBoolean called = new AtomicBoolean(false);
IOTools.safeClose(new AbstractReader()
{
public void close() throws IOException
@@ -397,7 +396,7 @@
public void testWriterSafeClose()
{
IOTools.safeClose((Writer)null);
- final SynchronizedBoolean called = new SynchronizedBoolean(false);
+ final AtomicBoolean called = new AtomicBoolean(false);
IOTools.safeClose(new AbstractWriter()
{
public void close() throws IOException
@@ -479,7 +478,7 @@
}
//
- final SynchronizedBoolean closeCalled1 = new SynchronizedBoolean(false);
+ final AtomicBoolean closeCalled1 = new AtomicBoolean(false);
final IOException ioException1 = new IOException();
try
{
@@ -503,7 +502,7 @@
}
//
- final SynchronizedBoolean closeCalled2 = new SynchronizedBoolean(false);
+ final AtomicBoolean closeCalled2 = new AtomicBoolean(false);
IOTools.copy(new AbstractInputStream()
{
public int read() throws IOException
@@ -519,7 +518,7 @@
//
final IOException ioException2 = new IOException();
- final SynchronizedBoolean closeCalled3 = new SynchronizedBoolean(false);
+ final AtomicBoolean closeCalled3 = new AtomicBoolean(false);
try
{
IOTools.copy(new ByteArrayInputStream(new byte[1]), new AbstractOutputStream()
@@ -541,7 +540,7 @@
}
//
- final SynchronizedBoolean closeCalled4 = new SynchronizedBoolean(false);
+ final AtomicBoolean closeCalled4 = new AtomicBoolean(false);
IOTools.copy(new ByteArrayInputStream(new byte[1]), new AbstractOutputStream()
{
public void close() throws IOException
@@ -581,7 +580,7 @@
}
//
- final SynchronizedBoolean closeCalled1 = new SynchronizedBoolean(false);
+ final AtomicBoolean closeCalled1 = new AtomicBoolean(false);
final IOException ioException1 = new IOException();
try
{
@@ -605,7 +604,7 @@
}
//
- final SynchronizedBoolean closeCalled2 = new SynchronizedBoolean(false);
+ final AtomicBoolean closeCalled2 = new AtomicBoolean(false);
IOTools.copy(new AbstractReader()
{
public int read(char cbuf[], int off, int len) throws IOException
@@ -621,7 +620,7 @@
//
final IOException ioException2 = new IOException();
- final SynchronizedBoolean closeCalled3 = new SynchronizedBoolean(false);
+ final AtomicBoolean closeCalled3 = new AtomicBoolean(false);
try
{
IOTools.copy(new CharArrayReader(new char[1]), new AbstractWriter()
@@ -643,7 +642,7 @@
}
//
- final SynchronizedBoolean closeCalled4 = new SynchronizedBoolean(false);
+ final AtomicBoolean closeCalled4 = new AtomicBoolean(false);
IOTools.copy(new CharArrayReader(new char[1]), new AbstractWriter()
{
public void close() throws IOException