[jboss-cvs] JBossAS SVN: r84249 - in projects/ejb3/trunk/async-impl/src: main/java/org/jboss/ejb3/async/impl and 16 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Feb 16 09:11:01 EST 2009


Author: ALRubinger
Date: 2009-02-16 09:11:00 -0500 (Mon, 16 Feb 2009)
New Revision: 84249

Added:
   projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/
   projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/future/
   projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/hack/
   projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/interceptor/
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/common/
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/container/
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/security/
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/security/SecurityAwarePojo.java
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/security/unit/
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/simple/
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/simple/Pojo.java
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/simple/unit/
Removed:
   projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/future/
   projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/hack/
   projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/interceptor/
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/common/
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/container/
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/security/SecurityAwarePojo.java
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/security/unit/
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/simple/Pojo.java
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/simple/unit/
Modified:
   projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/future/AsyncFutureWrapper.java
   projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/hack/DevelopmentHacks.java
   projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/interceptor/AsynchronousInterceptor.java
   projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/interceptor/SecurityActions.java
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/common/SecurityActions.java
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/common/TestConstants.java
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/container/AsyncContainer.java
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/security/unit/SecurityContextPropagationTestCase.java
   projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/simple/unit/SimpleAsyncTestCase.java
   projects/ejb3/trunk/async-impl/src/test/resources/simple/jboss-aop.xml
Log:
[EJBTHREE-1729] Clear package namespace for ejb3-async-impl to async.impl

Copied: projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/future (from rev 84214, projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/future)


Property changes on: projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/future
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/future/AsyncFutureWrapper.java
===================================================================
--- projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/future/AsyncFutureWrapper.java	2009-02-14 19:17:31 UTC (rev 84214)
+++ projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/future/AsyncFutureWrapper.java	2009-02-16 14:11:00 UTC (rev 84249)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.ejb3.async.future;
+package org.jboss.ejb3.async.impl.future;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

Copied: projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/hack (from rev 84214, projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/hack)


Property changes on: projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/hack
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/hack/DevelopmentHacks.java
===================================================================
--- projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/hack/DevelopmentHacks.java	2009-02-14 19:17:31 UTC (rev 84214)
+++ projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/hack/DevelopmentHacks.java	2009-02-16 14:11:00 UTC (rev 84249)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.ejb3.async.hack;
+package org.jboss.ejb3.async.impl.hack;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

Copied: projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/interceptor (from rev 84214, projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/interceptor)


Property changes on: projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/interceptor
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/interceptor/AsynchronousInterceptor.java
===================================================================
--- projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/interceptor/AsynchronousInterceptor.java	2009-02-14 19:17:31 UTC (rev 84214)
+++ projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/interceptor/AsynchronousInterceptor.java	2009-02-16 14:11:00 UTC (rev 84249)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.ejb3.async.interceptor;
+package org.jboss.ejb3.async.impl.interceptor;
 
 import java.lang.reflect.Method;
 import java.util.concurrent.Callable;
@@ -31,8 +31,8 @@
 import org.jboss.aop.advice.Interceptor;
 import org.jboss.aop.joinpoint.Invocation;
 import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.ejb3.async.future.AsyncFutureWrapper;
-import org.jboss.ejb3.async.hack.DevelopmentHacks;
+import org.jboss.ejb3.async.impl.future.AsyncFutureWrapper;
+import org.jboss.ejb3.async.impl.hack.DevelopmentHacks;
 import org.jboss.ejb3.async.spi.container.AsyncInvocationProcessor;
 import org.jboss.logging.Logger;
 import org.jboss.security.SecurityContext;

Modified: projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/interceptor/SecurityActions.java
===================================================================
--- projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/interceptor/SecurityActions.java	2009-02-14 19:17:31 UTC (rev 84214)
+++ projects/ejb3/trunk/async-impl/src/main/java/org/jboss/ejb3/async/impl/interceptor/SecurityActions.java	2009-02-16 14:11:00 UTC (rev 84249)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.ejb3.async.interceptor;
+package org.jboss.ejb3.async.impl.interceptor;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;

Copied: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/common (from rev 84214, projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/common)


Property changes on: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/common
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/common/SecurityActions.java
===================================================================
--- projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/common/SecurityActions.java	2009-02-14 19:17:31 UTC (rev 84214)
+++ projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/common/SecurityActions.java	2009-02-16 14:11:00 UTC (rev 84249)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.ejb3.async.test.common;
+package org.jboss.ejb3.async.impl.test.common;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;

Modified: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/common/TestConstants.java
===================================================================
--- projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/common/TestConstants.java	2009-02-14 19:17:31 UTC (rev 84214)
+++ projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/common/TestConstants.java	2009-02-16 14:11:00 UTC (rev 84249)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.ejb3.async.test.common;
+package org.jboss.ejb3.async.impl.test.common;
 
 /**
  * TestConstants

Copied: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/container (from rev 84214, projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/container)


Property changes on: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/container
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/container/AsyncContainer.java
===================================================================
--- projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/container/AsyncContainer.java	2009-02-14 19:17:31 UTC (rev 84214)
+++ projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/container/AsyncContainer.java	2009-02-16 14:11:00 UTC (rev 84249)
@@ -19,11 +19,11 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.ejb3.async.test.container;
+package org.jboss.ejb3.async.impl.test.container;
 
 import java.util.concurrent.ExecutorService;
 
-import org.jboss.ejb3.async.hack.DevelopmentHacks;
+import org.jboss.ejb3.async.impl.hack.DevelopmentHacks;
 import org.jboss.ejb3.async.spi.container.AsyncInvocationProcessor;
 import org.jboss.ejb3.interceptors.direct.DirectContainer;
 

Copied: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/security/SecurityAwarePojo.java (from rev 84214, projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/security/SecurityAwarePojo.java)
===================================================================
--- projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/security/SecurityAwarePojo.java	                        (rev 0)
+++ projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/security/SecurityAwarePojo.java	2009-02-16 14:11:00 UTC (rev 84249)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+  *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.async.impl.test.security;
+
+import java.util.concurrent.Future;
+
+import javax.ejb.AsyncResult;
+
+import org.jboss.ejb3.async.impl.test.common.SecurityActions;
+import org.jboss.security.SecurityContext;
+
+/**
+ * SecurityAwarePojo
+ * 
+ * POJO for testing Security Context propagation in @Asynchronous
+ * invocations
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public class SecurityAwarePojo
+{
+
+   /**
+    * Returns the security context associated with this Thread
+    * 
+    * @return
+    */
+   public Future<SecurityContext> getSecurityContext()
+   {
+      return new AsyncResult<SecurityContext>(SecurityActions.getSecurityContext());
+   }
+
+}


Property changes on: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/security/SecurityAwarePojo.java
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/security/unit (from rev 84214, projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/security/unit)


Property changes on: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/security/unit
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/security/unit/SecurityContextPropagationTestCase.java
===================================================================
--- projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/security/unit/SecurityContextPropagationTestCase.java	2009-02-14 19:17:31 UTC (rev 84214)
+++ projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/security/unit/SecurityContextPropagationTestCase.java	2009-02-16 14:11:00 UTC (rev 84249)
@@ -19,17 +19,17 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.ejb3.async.test.security.unit;
+package org.jboss.ejb3.async.impl.test.security.unit;
 
 import java.util.concurrent.Future;
 
 import junit.framework.TestCase;
 
 import org.jboss.aspects.common.AOPDeployer;
-import org.jboss.ejb3.async.test.common.SecurityActions;
-import org.jboss.ejb3.async.test.common.TestConstants;
-import org.jboss.ejb3.async.test.container.AsyncContainer;
-import org.jboss.ejb3.async.test.security.SecurityAwarePojo;
+import org.jboss.ejb3.async.impl.test.common.SecurityActions;
+import org.jboss.ejb3.async.impl.test.common.TestConstants;
+import org.jboss.ejb3.async.impl.test.container.AsyncContainer;
+import org.jboss.ejb3.async.impl.test.security.SecurityAwarePojo;
 import org.jboss.ejb3.interceptors.container.BeanContext;
 import org.jboss.logging.Logger;
 import org.jboss.security.SecurityContext;

Copied: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/simple/Pojo.java (from rev 84214, projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/simple/Pojo.java)
===================================================================
--- projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/simple/Pojo.java	                        (rev 0)
+++ projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/simple/Pojo.java	2009-02-16 14:11:00 UTC (rev 84249)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+  *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.async.impl.test.simple;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.ejb.AsyncResult;
+import javax.ejb.Asynchronous;
+
+/**
+ * Pojo
+ * 
+ * A simple POJO to act as BeanContext for a test Container,
+ * candidate for asynchronous interception
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public class Pojo
+{
+   // --------------------------------------------------------------------------------||
+   // Class Members ------------------------------------------------------------------||
+   // --------------------------------------------------------------------------------||
+
+   public static final String VALUE = "Test Value";
+
+   // --------------------------------------------------------------------------------||
+   // Instance Members ---------------------------------------------------------------||
+   // --------------------------------------------------------------------------------||
+
+   public AtomicInteger counter = new AtomicInteger();
+
+   // --------------------------------------------------------------------------------||
+   // Business Methods ---------------------------------------------------------------||
+   // --------------------------------------------------------------------------------||
+
+   /**
+    * Obtains a contracted value, asynchronously
+    * 
+    * @return
+    */
+   public Future<String> getValueAsynchronous()
+   {
+      return new AsyncResult<String>(this.getValueSynchronous());
+   }
+
+   /**
+    * Obtains a contracted value
+    * 
+    * @return
+    */
+   public String getValueSynchronous()
+   {
+      return VALUE;
+   }
+
+   /**
+    * Increments the internal counter; intentionally
+    * void return to test @Asynchronous on void
+    */
+   @Asynchronous
+   public void incrementCounterAsynchronous()
+   {
+      // The @Asynchronous annotation here will spawn this off,
+      // so just delegate to the synchronous handling 
+      this.incrementCounterSynchronous();
+   }
+
+   /**
+    * Obtains the internal counter
+    * 
+    * @return
+    */
+   public Future<Integer> getCounter()
+   {
+      return new AsyncResult<Integer>(counter.intValue());
+   }
+
+   /**
+    * Increments the internal counter, though
+    * does so synchronously (not a candidate for
+    * interception)
+    */
+   public void incrementCounterSynchronous()
+   {
+      counter.incrementAndGet();
+   }
+
+}


Property changes on: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/simple/Pojo.java
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/simple/unit (from rev 84214, projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/simple/unit)


Property changes on: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/simple/unit
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/simple/unit/SimpleAsyncTestCase.java
===================================================================
--- projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/simple/unit/SimpleAsyncTestCase.java	2009-02-14 19:17:31 UTC (rev 84214)
+++ projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/impl/test/simple/unit/SimpleAsyncTestCase.java	2009-02-16 14:11:00 UTC (rev 84249)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.ejb3.async.test.simple.unit;
+package org.jboss.ejb3.async.impl.test.simple.unit;
 
 import java.util.concurrent.Future;
 
@@ -28,9 +28,9 @@
 import junit.framework.TestCase;
 
 import org.jboss.aspects.common.AOPDeployer;
-import org.jboss.ejb3.async.test.common.TestConstants;
-import org.jboss.ejb3.async.test.container.AsyncContainer;
-import org.jboss.ejb3.async.test.simple.Pojo;
+import org.jboss.ejb3.async.impl.test.common.TestConstants;
+import org.jboss.ejb3.async.impl.test.container.AsyncContainer;
+import org.jboss.ejb3.async.impl.test.simple.Pojo;
 import org.jboss.ejb3.interceptors.container.BeanContext;
 import org.jboss.logging.Logger;
 import org.junit.AfterClass;

Deleted: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/security/SecurityAwarePojo.java
===================================================================
--- projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/security/SecurityAwarePojo.java	2009-02-16 14:01:25 UTC (rev 84248)
+++ projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/security/SecurityAwarePojo.java	2009-02-16 14:11:00 UTC (rev 84249)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
-  *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.async.test.security;
-
-import java.util.concurrent.Future;
-
-import javax.ejb.AsyncResult;
-
-import org.jboss.ejb3.async.test.common.SecurityActions;
-import org.jboss.security.SecurityContext;
-
-/**
- * SecurityAwarePojo
- * 
- * POJO for testing Security Context propagation in @Asynchronous
- * invocations
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public class SecurityAwarePojo
-{
-
-   /**
-    * Returns the security context associated with this Thread
-    * 
-    * @return
-    */
-   public Future<SecurityContext> getSecurityContext()
-   {
-      return new AsyncResult<SecurityContext>(SecurityActions.getSecurityContext());
-   }
-
-}

Deleted: projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/simple/Pojo.java
===================================================================
--- projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/simple/Pojo.java	2009-02-16 14:01:25 UTC (rev 84248)
+++ projects/ejb3/trunk/async-impl/src/test/java/org/jboss/ejb3/async/test/simple/Pojo.java	2009-02-16 14:11:00 UTC (rev 84249)
@@ -1,109 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
-  *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.async.test.simple;
-
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.ejb.AsyncResult;
-import javax.ejb.Asynchronous;
-
-/**
- * Pojo
- * 
- * A simple POJO to act as BeanContext for a test Container,
- * candidate for asynchronous interception
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public class Pojo
-{
-   // --------------------------------------------------------------------------------||
-   // Class Members ------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   public static final String VALUE = "Test Value";
-
-   // --------------------------------------------------------------------------------||
-   // Instance Members ---------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   public AtomicInteger counter = new AtomicInteger();
-
-   // --------------------------------------------------------------------------------||
-   // Business Methods ---------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Obtains a contracted value, asynchronously
-    * 
-    * @return
-    */
-   public Future<String> getValueAsynchronous()
-   {
-      return new AsyncResult<String>(this.getValueSynchronous());
-   }
-
-   /**
-    * Obtains a contracted value
-    * 
-    * @return
-    */
-   public String getValueSynchronous()
-   {
-      return VALUE;
-   }
-
-   /**
-    * Increments the internal counter; intentionally
-    * void return to test @Asynchronous on void
-    */
-   @Asynchronous
-   public void incrementCounterAsynchronous()
-   {
-      // The @Asynchronous annotation here will spawn this off,
-      // so just delegate to the synchronous handling 
-      this.incrementCounterSynchronous();
-   }
-
-   /**
-    * Obtains the internal counter
-    * 
-    * @return
-    */
-   public Future<Integer> getCounter()
-   {
-      return new AsyncResult<Integer>(counter.intValue());
-   }
-
-   /**
-    * Increments the internal counter, though
-    * does so synchronously (not a candidate for
-    * interception)
-    */
-   public void incrementCounterSynchronous()
-   {
-      counter.incrementAndGet();
-   }
-
-}

Modified: projects/ejb3/trunk/async-impl/src/test/resources/simple/jboss-aop.xml
===================================================================
--- projects/ejb3/trunk/async-impl/src/test/resources/simple/jboss-aop.xml	2009-02-16 14:01:25 UTC (rev 84248)
+++ projects/ejb3/trunk/async-impl/src/test/resources/simple/jboss-aop.xml	2009-02-16 14:11:00 UTC (rev 84249)
@@ -7,7 +7,7 @@
     invocation, we may make the interceptor per-JVM
   -->
   <interceptor name="AsynchronousInterceptor"
-    class="org.jboss.ejb3.async.interceptor.AsynchronousInterceptor"
+    class="org.jboss.ejb3.async.impl.interceptor.AsynchronousInterceptor"
     scope="PER_INSTANCE" />
 
   <domain name="Asynchronous Container">




More information about the jboss-cvs-commits mailing list