activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r641977 - in /activemq/activeio/branches/activeio-3.0: ./ activeio-core/ activeio-core/src/main/java/org/apache/activeio/journal/active/ activeio-core/src/main/java/org/apache/activeio/packet/ activeio-core/src/main/java/org/apache/activeio...
Date Thu, 27 Mar 2008 20:52:29 GMT
Author: djencks
Date: Thu Mar 27 13:52:27 2008
New Revision: 641977

URL: http://svn.apache.org/viewvc?rev=641977&view=rev
Log:
make it build under java 1.4, fix up version etc

Modified:
    activemq/activeio/branches/activeio-3.0/activeio-core/pom.xml
    activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/BatchedWrite.java
    activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/JournalImpl.java
    activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java
    activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/packet/PacketPool.java
    activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/ServicePool.java
    activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStack.java
    activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStackGBean.java
    activemq/activeio/branches/activeio-3.0/activeio-core/src/test/java/org/apache/activeio/journal/JournalRWPerfToolSupport.java
    activemq/activeio/branches/activeio-3.0/activeio-core/src/test/java/org/apache/activeio/stats/CountStatisticImpl.java
    activemq/activeio/branches/activeio-3.0/pom.xml

Modified: activemq/activeio/branches/activeio-3.0/activeio-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activeio/branches/activeio-3.0/activeio-core/pom.xml?rev=641977&r1=641976&r2=641977&view=diff
==============================================================================
--- activemq/activeio/branches/activeio-3.0/activeio-core/pom.xml (original)
+++ activemq/activeio/branches/activeio-3.0/activeio-core/pom.xml Thu Mar 27 13:52:27 2008
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activeio-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>activeio-core</artifactId>
@@ -116,6 +116,11 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>backport-util-concurrent</groupId>
+      <artifactId>backport-util-concurrent</artifactId>
+    </dependency>
+    
   </dependencies>
 
   <profiles>

Modified: activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/BatchedWrite.java
URL: http://svn.apache.org/viewvc/activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/BatchedWrite.java?rev=641977&r1=641976&r2=641977&view=diff
==============================================================================
--- activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/BatchedWrite.java
(original)
+++ activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/BatchedWrite.java
Thu Mar 27 13:52:27 2008
@@ -19,7 +19,7 @@
 
 import org.apache.activeio.packet.Packet;
 
-import java.util.concurrent.CountDownLatch;
+import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
 
 /**
  * This contains all the data needed to write and force a list of records to a

Modified: activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/JournalImpl.java
URL: http://svn.apache.org/viewvc/activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/JournalImpl.java?rev=641977&r1=641976&r2=641977&view=diff
==============================================================================
--- activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/JournalImpl.java
(original)
+++ activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/JournalImpl.java
Thu Mar 27 13:52:27 2008
@@ -29,13 +29,13 @@
 import org.apache.activeio.packet.ByteBufferPacketPool;
 import org.apache.activeio.packet.Packet;
 
-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;
+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;
 
 /**
  * A high speed Journal implementation. Inspired by the ideas of the <a

Modified: activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java
URL: http://svn.apache.org/viewvc/activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java?rev=641977&r1=641976&r2=641977&view=diff
==============================================================================
--- activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java
(original)
+++ activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java
Thu Mar 27 13:52:27 2008
@@ -35,7 +35,7 @@
 import org.apache.activeio.packet.ByteBufferPacket;
 import org.apache.activeio.packet.Packet;
 
-import java.util.concurrent.atomic.AtomicInteger;
+import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Provides a logical view of many separate files as one single long log file.

Modified: activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/packet/PacketPool.java
URL: http://svn.apache.org/viewvc/activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/packet/PacketPool.java?rev=641977&r1=641976&r2=641977&view=diff
==============================================================================
--- activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/packet/PacketPool.java
(original)
+++ activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/packet/PacketPool.java
Thu Mar 27 13:52:27 2008
@@ -19,7 +19,7 @@
 
 import java.util.ArrayList;
 
-import java.util.concurrent.atomic.AtomicInteger;
+import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Provides a simple pool of Packet objects.  When the packets that this pool produces are
disposed,

Modified: activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/ServicePool.java
URL: http://svn.apache.org/viewvc/activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/ServicePool.java?rev=641977&r1=641976&r2=641977&view=diff
==============================================================================
--- activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/ServicePool.java
(original)
+++ activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/ServicePool.java
Thu Mar 27 13:52:27 2008
@@ -17,11 +17,11 @@
  */
 package org.apache.activeio.xnet;
 
-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 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 org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStack.java
URL: http://svn.apache.org/viewvc/activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStack.java?rev=641977&r1=641976&r2=641977&view=diff
==============================================================================
--- activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStack.java
(original)
+++ activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStack.java
Thu Mar 27 13:52:27 2008
@@ -17,7 +17,7 @@
  */
 package org.apache.activeio.xnet;
 
-import java.util.concurrent.Executor;
+import edu.emory.mathcs.backport.java.util.concurrent.Executor;
 
 import org.apache.activeio.xnet.hba.IPAddressPermission;
 import org.apache.activeio.xnet.hba.ServiceAccessController;

Modified: activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStackGBean.java
URL: http://svn.apache.org/viewvc/activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStackGBean.java?rev=641977&r1=641976&r2=641977&view=diff
==============================================================================
--- activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStackGBean.java
(original)
+++ activemq/activeio/branches/activeio-3.0/activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStackGBean.java
Thu Mar 27 13:52:27 2008
@@ -17,7 +17,7 @@
  */
 package org.apache.activeio.xnet;
 
-import java.util.concurrent.Executor;
+import edu.emory.mathcs.backport.java.util.concurrent.Executor;
 
 import org.apache.activeio.xnet.hba.IPAddressPermission;
 import org.apache.geronimo.gbean.GBeanData;

Modified: activemq/activeio/branches/activeio-3.0/activeio-core/src/test/java/org/apache/activeio/journal/JournalRWPerfToolSupport.java
URL: http://svn.apache.org/viewvc/activemq/activeio/branches/activeio-3.0/activeio-core/src/test/java/org/apache/activeio/journal/JournalRWPerfToolSupport.java?rev=641977&r1=641976&r2=641977&view=diff
==============================================================================
--- activemq/activeio/branches/activeio-3.0/activeio-core/src/test/java/org/apache/activeio/journal/JournalRWPerfToolSupport.java
(original)
+++ activemq/activeio/branches/activeio-3.0/activeio-core/src/test/java/org/apache/activeio/journal/JournalRWPerfToolSupport.java
Thu Mar 27 13:52:27 2008
@@ -22,7 +22,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Random;
-import java.util.concurrent.atomic.AtomicLong;
+import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.activeio.journal.InvalidRecordLocationException;
 import org.apache.activeio.journal.Journal;

Modified: activemq/activeio/branches/activeio-3.0/activeio-core/src/test/java/org/apache/activeio/stats/CountStatisticImpl.java
URL: http://svn.apache.org/viewvc/activemq/activeio/branches/activeio-3.0/activeio-core/src/test/java/org/apache/activeio/stats/CountStatisticImpl.java?rev=641977&r1=641976&r2=641977&view=diff
==============================================================================
--- activemq/activeio/branches/activeio-3.0/activeio-core/src/test/java/org/apache/activeio/stats/CountStatisticImpl.java
(original)
+++ activemq/activeio/branches/activeio-3.0/activeio-core/src/test/java/org/apache/activeio/stats/CountStatisticImpl.java
Thu Mar 27 13:52:27 2008
@@ -17,7 +17,7 @@
  */
 package org.apache.activeio.stats;
 
-import java.util.concurrent.atomic.AtomicLong;
+import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
 
 import javax.management.j2ee.statistics.CountStatistic;
 

Modified: activemq/activeio/branches/activeio-3.0/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activeio/branches/activeio-3.0/pom.xml?rev=641977&r1=641976&r2=641977&view=diff
==============================================================================
--- activemq/activeio/branches/activeio-3.0/pom.xml (original)
+++ activemq/activeio/branches/activeio-3.0/pom.xml Thu Mar 27 13:52:27 2008
@@ -16,13 +16,18 @@
   limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>3</version>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>activeio-parent</artifactId>
-  <version>3.1-SNAPSHOT</version>
+  <version>3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>ActiveIO</name>
   <description></description>
@@ -32,7 +37,7 @@
   </modules>
 
   <prerequisites>
-    <maven>2.0.4</maven>
+    <maven>2.0.7</maven>
   </prerequisites>
 
   <url>http://activemq.apache.org/</url>
@@ -52,9 +57,9 @@
   <mailingLists>
     <mailingList>
       <name>Development List</name>
-      <subscribe>activemq-dev@geronimo.apache.org</subscribe>
-      <unsubscribe>activemq-dev@geronimo.apache.org</unsubscribe>
-      <post>activemq-dev@geronimo.apache.org</post>
+      <subscribe>dev-subscribe@activemq.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@activemq.apache.org</unsubscribe>
+      <post>dev@activemq.apache.org</post>
     </mailingList>
   </mailingLists>
 
@@ -102,6 +107,11 @@
         <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>
 
@@ -113,12 +123,13 @@
     <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://people.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-dist-repo-url>
-    <dist-repo-url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</dist-repo-url>
-    <site-repo-url>scpexe://people.apache.org/www/incubator.apache.org/activemq/activeio-maven/</site-repo-url>
+    <!--<dist-repo-url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</dist-repo-url>-->
+    <!--<site-repo-url>scpexe://people.apache.org/www/incubator.apache.org/activemq/activeio-maven/</site-repo-url>-->
   </properties>
 
+<!--
   <ciManagement>
     <system>continuum</system>
     <url>http://ci.gbuild.org/continuum</url>
@@ -138,7 +149,9 @@
       </notifier>
     </notifiers>
   </ciManagement>
+-->
 
+<!--
   <repositories>
     <repository>
       <id>central</id>
@@ -158,7 +171,9 @@
       </releases>
     </repository>
   </repositories>
-      
+-->
+
+<!--
   <pluginRepositories>
     <pluginRepository>
       <id>apache.incubating.releases</id>
@@ -174,6 +189,7 @@
       </releases>
     </pluginRepository>
   </pluginRepositories>
+-->
 
   <distributionManagement>
     <repository>
@@ -215,22 +231,6 @@
           <outputDirectory>${basedir}/eclipse-classes</outputDirectory>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-one-plugin</artifactId>
-        <version>1.0</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>install-maven-one-repository</goal>
-              <goal>deploy-maven-one-repository</goal>
-            </goals>
-            <configuration>
-              <remoteRepositoryId>apache.m1.releases</remoteRepositoryId>
-              <remoteRepositoryUrl>${m1-dist-repo-url}</remoteRepositoryUrl>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
@@ -269,7 +269,7 @@
         <configuration>
           <links>
             <link>http://java.sun.com/j2ee/1.4/docs/api</link>
-            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+            <!--<link>http://java.sun.com/j2se/1.5.0/docs/api</link>-->
           </links>
         </configuration>
       </plugin>



Mime
View raw message