[jboss-cvs] JBossAS SVN: r83231 - in projects/ejb3/trunk/async: src/main/java/org/jboss/aspects/asynch and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-01-22 00:24:19 -0500 (Thu, 22 Jan 2009)
New Revision: 83231

Modified:
   projects/ejb3/trunk/async/pom.xml
   projects/ejb3/trunk/async/src/main/java/org/jboss/aspects/asynch/FutureImpl.java
Log:
[EJBTHREE-1234] Updage ejb3-async to ejb3-build:1.0.0, correct to exclude now banned dependencies, and resolve API to j.u.c. instead of oswego concurrent

Modified: projects/ejb3/trunk/async/pom.xml
===================================================================
--- projects/ejb3/trunk/async/pom.xml	2009-01-22 05:02:29 UTC (rev 83230)
+++ projects/ejb3/trunk/async/pom.xml	2009-01-22 05:24:19 UTC (rev 83231)
@@ -14,7 +14,7 @@
   <!-- Artifact Information -->
   <groupId>org.jboss.ejb3</groupId>
   <artifactId>jboss-ejb3-async</artifactId>
-  <version>0.1.2-SNAPSHOT</version>
+  <version>1.0.0</version>
   <packaging>jar</packaging>
   <name>JBoss EJB 3.0 Aspects [Async]</name>
   <description>The Java EJB3 Asynchronous Aspects</description>
@@ -30,6 +30,13 @@
     <dependency>
       <groupId>org.jboss.aop</groupId>
       <artifactId>jboss-aop-aspects</artifactId>
+      <version>2.0.0.SP1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-test</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
@@ -45,7 +52,19 @@
       <groupId>org.jboss.aspects</groupId>
       <artifactId>jboss-remoting-aspects</artifactId>
       <version>1.0.1.CR2</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-transaction-spi</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     
   </dependencies>
+
+  <scm>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-async-1.0.0</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-async-1.0.0</developerConnection>
+    <url>http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-async-1.0.0</url>
+  </scm>
 </project>

Modified: projects/ejb3/trunk/async/src/main/java/org/jboss/aspects/asynch/FutureImpl.java
===================================================================
--- projects/ejb3/trunk/async/src/main/java/org/jboss/aspects/asynch/FutureImpl.java	2009-01-22 05:02:29 UTC (rev 83230)
+++ projects/ejb3/trunk/async/src/main/java/org/jboss/aspects/asynch/FutureImpl.java	2009-01-22 05:24:19 UTC (rev 83231)
@@ -21,12 +21,11 @@
   */
 package org.jboss.aspects.asynch;
 
-import EDU.oswego.cs.dl.util.concurrent.FutureResult;
+import java.lang.reflect.InvocationTargetException;
+
 import org.jboss.aop.Dispatcher;
 import org.jboss.util.id.GUID;
 
-import java.lang.reflect.InvocationTargetException;
-
 /**
  * Comment
  *
@@ -36,10 +35,10 @@
 public class FutureImpl
 implements RemotableFuture
 {
-   private FutureResult result;
+   private Future result;
    private GUID remoteObjectID;
 
-   public FutureImpl(FutureResult result)
+   public FutureImpl(Future result)
    {
       this.result = result;
    }
@@ -76,11 +75,11 @@
    {
       try
       {
-         Object rtn = result.timedGet(milliseconds);
+         Object rtn = result.get(milliseconds);
          release();
          return rtn;
       }
-      catch (EDU.oswego.cs.dl.util.concurrent.TimeoutException e)
+      catch (TimeoutException e)
       {
          throw new TimeoutException(e);
       }
@@ -93,7 +92,7 @@
 
    public boolean isDone()
    {
-      return result.isReady();
+      return result.isDone();
    }
 
 }