activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r476005 - in /incubator/activemq/activeio/trunk: ./ activeio-core/ activeio-core/src/main/java/org/apache/activeio/journal/ activeio-core/src/main/java/org/apache/activeio/journal/active/ activeio-core/src/main/java/org/apache/activeio/jour...
Date Fri, 17 Nov 2006 00:40:54 GMT
Author: chirino
Date: Thu Nov 16 16:40:53 2006
New Revision: 476005

URL: http://svn.apache.org/viewvc?view=rev&rev=476005
Log:
Switching to Java 5.. Build and Runtime now require Java 5 see: http://www.nabble.com/Switching-to-ActiveMQ-4.2-to-Java-5----tf2637427.html
- Update maven build
- Removed dependency on concurrent-backport


Modified:
    incubator/activemq/activeio/trunk/activeio-core/pom.xml
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/Journal.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/JournalEventListener.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/BatchedWrite.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/ControlFile.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/JournalImpl.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFile.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileNode.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/RecordInfo.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/howl/HowlJournal.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/howl/LongRecordLocation.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/HttpRecognizer.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/IIOPRecognizer.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/UnknownRecognizer.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/AppendedPacket.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/ByteBufferPacket.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/BytePacket.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/ByteSequence.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/EOSPacket.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/EmptyPacket.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/FilterPacket.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/PacketPool.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/ServicePool.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStack.java
    incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStackGBean.java
    incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/journal/JournalStatsFilter.java
    incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/stats/CountStatisticImpl.java
    incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/xnet/hba/ServiceAccessControllerTest.java
    incubator/activemq/activeio/trunk/pom.xml

Modified: incubator/activemq/activeio/trunk/activeio-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/pom.xml?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/pom.xml (original)
+++ incubator/activemq/activeio/trunk/activeio-core/pom.xml Thu Nov 16 16:40:53 2006
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activeio-parent</artifactId>
-    <version>3.0-incubator</version>
+    <version>3.1-incubator-SNAPSHOT</version>
   </parent>
 
   <artifactId>activeio-core</artifactId>
@@ -64,11 +64,6 @@
   </build>
 
   <dependencies>
-    <!-- Required Dependencies -->
-    <dependency>
-      <groupId>backport-util-concurrent</groupId>
-      <artifactId>backport-util-concurrent</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>commons-logging</groupId>

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/Journal.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/Journal.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/Journal.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/Journal.java
Thu Nov 16 16:40:53 2006
@@ -125,4 +125,4 @@
 	 */
 	public abstract void setJournalEventListener(JournalEventListener listener) throws IllegalStateException;
 	
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/JournalEventListener.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/JournalEventListener.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/JournalEventListener.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/JournalEventListener.java
Thu Nov 16 16:40:53 2006
@@ -35,4 +35,4 @@
 	 */
 	void overflowNotification(RecordLocation safeLocation);
 
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/BatchedWrite.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/BatchedWrite.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/BatchedWrite.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/BatchedWrite.java
Thu Nov 16 16:40:53 2006
@@ -19,7 +19,7 @@
 
 import org.apache.activeio.packet.Packet;
 
-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+import java.util.concurrent.CountDownLatch;
 
 /**
  * This contains all the data needed to write and force a list of records to a

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/ControlFile.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/ControlFile.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/ControlFile.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/ControlFile.java
Thu Nov 16 16:40:53 2006
@@ -198,4 +198,4 @@
         } catch (IOException e) {
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/JournalImpl.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/JournalImpl.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/JournalImpl.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/JournalImpl.java
Thu Nov 16 16:40:53 2006
@@ -29,13 +29,13 @@
 import org.apache.activeio.packet.ByteBufferPacketPool;
 import org.apache.activeio.packet.Packet;
 
-import edu.emory.mathcs.backport.java.util.concurrent.Callable;
-import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException;
-import edu.emory.mathcs.backport.java.util.concurrent.FutureTask;
-import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * A high speed Journal implementation. Inspired by the ideas of the <a
@@ -112,7 +112,7 @@
                 return answer;
             }
         });
-        executor.allowCoreThreadTimeOut(true);
+        //executor.allowCoreThreadTimeOut(true);
         
         lastMarkedLocation = file.getLastMarkedRecordLocation();
         Location nextAppendLocation = file.getNextAppendLocation();

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFile.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFile.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFile.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFile.java
Thu Nov 16 16:40:53 2006
@@ -151,4 +151,4 @@
         fos.getChannel().force(false);
         fos.close();
     }
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java
Thu Nov 16 16:40:53 2006
@@ -34,7 +34,7 @@
 import org.apache.activeio.packet.ByteBufferPacket;
 import org.apache.activeio.packet.Packet;
 
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Provides a logical view of many separate files as one single long log file.

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileNode.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileNode.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileNode.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileNode.java
Thu Nov 16 16:40:53 2006
@@ -158,4 +158,4 @@
         appendOffset = offset;
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/RecordInfo.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/RecordInfo.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/RecordInfo.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/RecordInfo.java
Thu Nov 16 16:40:53 2006
@@ -57,4 +57,4 @@
     public int getDataOffset() {
         return location.getLogFileOffset() + Record.RECORD_HEADER_SIZE;
     }
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/howl/HowlJournal.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/howl/HowlJournal.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/howl/HowlJournal.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/howl/HowlJournal.java
Thu Nov 16 16:40:53 2006
@@ -199,4 +199,4 @@
 		
 	}
 
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/howl/LongRecordLocation.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/howl/LongRecordLocation.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/howl/LongRecordLocation.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/howl/LongRecordLocation.java
Thu Nov 16 16:40:53 2006
@@ -71,4 +71,4 @@
 	public String toString() {
 		return "0x" + Long.toHexString(location);
 	}
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/HttpRecognizer.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/HttpRecognizer.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/HttpRecognizer.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/HttpRecognizer.java
Thu Nov 16 16:40:53 2006
@@ -64,4 +64,4 @@
         
         return methods.contains(b.toString());
     }
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/IIOPRecognizer.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/IIOPRecognizer.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/IIOPRecognizer.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/IIOPRecognizer.java
Thu Nov 16 16:40:53 2006
@@ -34,4 +34,4 @@
             packet.read()=='P' 
                 );
     }
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/UnknownRecognizer.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/UnknownRecognizer.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/UnknownRecognizer.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/oneport/UnknownRecognizer.java
Thu Nov 16 16:40:53 2006
@@ -32,4 +32,4 @@
             return true;
         return false;
     }
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/AppendedPacket.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/AppendedPacket.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/AppendedPacket.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/AppendedPacket.java
Thu Nov 16 16:40:53 2006
@@ -243,4 +243,4 @@
         last.dispose();
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/ByteBufferPacket.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/ByteBufferPacket.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/ByteBufferPacket.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/ByteBufferPacket.java
Thu Nov 16 16:40:53 2006
@@ -282,4 +282,4 @@
     
     public void dispose() {        
     }
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/BytePacket.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/BytePacket.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/BytePacket.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/BytePacket.java
Thu Nov 16 16:40:53 2006
@@ -207,4 +207,4 @@
     
     public void dispose() {        
     }
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/ByteSequence.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/ByteSequence.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/ByteSequence.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/ByteSequence.java
Thu Nov 16 16:40:53 2006
@@ -38,4 +38,4 @@
         return offset;
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/EOSPacket.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/EOSPacket.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/EOSPacket.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/EOSPacket.java
Thu Nov 16 16:40:53 2006
@@ -149,4 +149,4 @@
     public void dispose() {        
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/EmptyPacket.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/EmptyPacket.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/EmptyPacket.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/EmptyPacket.java
Thu Nov 16 16:40:53 2006
@@ -151,4 +151,4 @@
     public void dispose() {        
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/FilterPacket.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/FilterPacket.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/FilterPacket.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/FilterPacket.java
Thu Nov 16 16:40:53 2006
@@ -135,4 +135,4 @@
     }
 
     abstract public Packet filter(Packet packet);
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/PacketPool.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/PacketPool.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/PacketPool.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/packet/PacketPool.java
Thu Nov 16 16:40:53 2006
@@ -19,7 +19,7 @@
 
 import java.util.ArrayList;
 
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Provides a simple pool of Packet objects.  When the packets that this pool produces are
disposed,

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/ServicePool.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/ServicePool.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/ServicePool.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/ServicePool.java
Thu Nov 16 16:40:53 2006
@@ -17,11 +17,11 @@
  */
 package org.apache.activeio.xnet;
 
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
-import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
-import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+import java.util.concurrent.Executor;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStack.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStack.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStack.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStack.java
Thu Nov 16 16:40:53 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.activeio.xnet;
 
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
+import java.util.concurrent.Executor;
 
 import org.apache.activeio.xnet.hba.IPAddressPermission;
 import org.apache.activeio.xnet.hba.ServiceAccessController;

Modified: incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStackGBean.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStackGBean.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStackGBean.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStackGBean.java
Thu Nov 16 16:40:53 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.activeio.xnet;
 
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
+import java.util.concurrent.Executor;
 
 import org.apache.activeio.xnet.hba.IPAddressPermission;
 import org.apache.geronimo.gbean.GBeanData;

Modified: incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/journal/JournalStatsFilter.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/journal/JournalStatsFilter.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/journal/JournalStatsFilter.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/journal/JournalStatsFilter.java
Thu Nov 16 16:40:53 2006
@@ -263,4 +263,4 @@
 		readLatency.reset(); 
 		readBytesCounter.reset();
 	}
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/stats/CountStatisticImpl.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/stats/CountStatisticImpl.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/stats/CountStatisticImpl.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/stats/CountStatisticImpl.java
Thu Nov 16 16:40:53 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.activeio.stats;
 
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicLong;
 
 import javax.management.j2ee.statistics.CountStatistic;
 

Modified: incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/xnet/hba/ServiceAccessControllerTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/xnet/hba/ServiceAccessControllerTest.java?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/xnet/hba/ServiceAccessControllerTest.java
(original)
+++ incubator/activemq/activeio/trunk/activeio-core/src/test/java/org/apache/activeio/xnet/hba/ServiceAccessControllerTest.java
Thu Nov 16 16:40:53 2006
@@ -218,4 +218,4 @@
             throw new AssertionError();
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/activemq/activeio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/activeio/trunk/pom.xml?view=diff&rev=476005&r1=476004&r2=476005
==============================================================================
--- incubator/activemq/activeio/trunk/pom.xml (original)
+++ incubator/activemq/activeio/trunk/pom.xml Thu Nov 16 16:40:53 2006
@@ -22,7 +22,7 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>activeio-parent</artifactId>
-  <version>3.0-incubator</version>
+  <version>3.1-incubator-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>ActiveIO</name>
   <description></description>
@@ -101,11 +101,6 @@
         <artifactId>commons-logging</artifactId>
         <version>${commons-logging-version}</version>
       </dependency>
-      <dependency>
-        <groupId>backport-util-concurrent</groupId>
-        <artifactId>backport-util-concurrent</artifactId>
-        <version>${backport-util-concurrent-version}</version>
-      </dependency>
 
     </dependencies>
   </dependencyManagement>
@@ -118,7 +113,6 @@
     <log4j-version>1.2.12</log4j-version>
     <mx4j-version>2.1.1</mx4j-version>
     <commons-logging-version>1.1</commons-logging-version>
-    <backport-util-concurrent-version>2.1</backport-util-concurrent-version>
 
     <m1-dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-dist-repo-url>
     <dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-incubating-repository</dist-repo-url>



Mime
View raw message