[jboss-cvs] JBossAS SVN: r105149 - in projects/ejb-book/trunk: ch04-firstejb and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 24 10:52:54 EDT 2010
Author: ALRubinger
Date: 2010-05-24 10:52:53 -0400 (Mon, 24 May 2010)
New Revision: 105149
Modified:
projects/ejb-book/trunk/build/pom.xml
projects/ejb-book/trunk/ch04-firstejb/pom.xml
projects/ejb-book/trunk/ch05-encryption/pom.xml
projects/ejb-book/trunk/ch06-filetransfer/pom.xml
projects/ejb-book/trunk/ch08-statusupdate/src/test/java/org/jboss/ejb3/examples/ch08/statusupdate/mdb/StatusUpdateIntegrationTest.java
projects/ejb-book/trunk/ch09-secureschool/pom.xml
projects/ejb-book/trunk/chxx-employeeregistry/src/test/java/org/jboss/ejb3/examples/employeeregistry/EmployeeIntegrationTest.java
projects/ejb-book/trunk/chxx-interceptors/pom.xml
projects/ejb-book/trunk/chxx-interceptors/src/main/java/org/jboss/ejb3/examples/chxx/tuner/CachingAuditor.java
projects/ejb-book/trunk/chxx-interceptors/src/test/java/org/jboss/ejb3/examples/chxx/tuner/CachingInterceptorUnitTestCase.java
projects/ejb-book/trunk/chxx-interceptors/src/test/java/org/jboss/ejb3/examples/chxx/tuner/Channel2RestrictorUnitTestCase.java
projects/ejb-book/trunk/chxx-interceptors/src/test/java/org/jboss/ejb3/examples/chxx/tuner/InterceptionIntegrationTest.java
projects/ejb-book/trunk/chxx-poker/src/test/java/org/jboss/ejb3/examples/chxx/transactions/TransactionalPokerGameIntegrationTest.java
Log:
[EJBBOOK-21] Bring in line w/ latest ARQ SNAP
Modified: projects/ejb-book/trunk/build/pom.xml
===================================================================
--- projects/ejb-book/trunk/build/pom.xml 2010-05-24 14:12:16 UTC (rev 105148)
+++ projects/ejb-book/trunk/build/pom.xml 2010-05-24 14:52:53 UTC (rev 105149)
@@ -31,6 +31,7 @@
<version.org.apache.openejb>3.1.2</version.org.apache.openejb>
<version.org.jboss.spec.javax.ejb>1.0.0.Beta2</version.org.jboss.spec.javax.ejb>
<version.javax_javaee.api>6.0</version.javax_javaee.api>
+ <version.javax.inject_javax.inject>1</version.javax.inject_javax.inject>
</properties>
@@ -218,6 +219,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${version.org.apache.openejb}</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -228,6 +230,13 @@
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>${version.javax.inject_javax.inject}</version>
+ </dependency>
+
+
</dependencies>
</dependencyManagement>
Modified: projects/ejb-book/trunk/ch04-firstejb/pom.xml
===================================================================
--- projects/ejb-book/trunk/ch04-firstejb/pom.xml 2010-05-24 14:12:16 UTC (rev 105148)
+++ projects/ejb-book/trunk/ch04-firstejb/pom.xml 2010-05-24 14:52:53 UTC (rev 105149)
@@ -49,6 +49,18 @@
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-junit</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: projects/ejb-book/trunk/ch05-encryption/pom.xml
===================================================================
--- projects/ejb-book/trunk/ch05-encryption/pom.xml 2010-05-24 14:12:16 UTC (rev 105148)
+++ projects/ejb-book/trunk/ch05-encryption/pom.xml 2010-05-24 14:52:53 UTC (rev 105149)
@@ -69,6 +69,17 @@
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-junit</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: projects/ejb-book/trunk/ch06-filetransfer/pom.xml
===================================================================
--- projects/ejb-book/trunk/ch06-filetransfer/pom.xml 2010-05-24 14:12:16 UTC (rev 105148)
+++ projects/ejb-book/trunk/ch06-filetransfer/pom.xml 2010-05-24 14:52:53 UTC (rev 105149)
@@ -105,6 +105,17 @@
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-junit</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: projects/ejb-book/trunk/ch08-statusupdate/src/test/java/org/jboss/ejb3/examples/ch08/statusupdate/mdb/StatusUpdateIntegrationTest.java
===================================================================
--- projects/ejb-book/trunk/ch08-statusupdate/src/test/java/org/jboss/ejb3/examples/ch08/statusupdate/mdb/StatusUpdateIntegrationTest.java 2010-05-24 14:12:16 UTC (rev 105148)
+++ projects/ejb-book/trunk/ch08-statusupdate/src/test/java/org/jboss/ejb3/examples/ch08/statusupdate/mdb/StatusUpdateIntegrationTest.java 2010-05-24 14:52:53 UTC (rev 105149)
@@ -35,7 +35,7 @@
import javax.naming.InitialContext;
import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.api.RunMode;
+import org.jboss.arquillian.api.Run;
import org.jboss.arquillian.api.RunModeType;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.ejb3.examples.ch08.statusupdate.api.StatusUpdate;
@@ -57,7 +57,7 @@
* @version $Revision: $
*/
@RunWith(Arquillian.class)
- at RunMode(RunModeType.LOCAL)
+ at Run(RunModeType.AS_CLIENT)
public class StatusUpdateIntegrationTest extends StatusUpdateTestBase
{
Modified: projects/ejb-book/trunk/ch09-secureschool/pom.xml
===================================================================
--- projects/ejb-book/trunk/ch09-secureschool/pom.xml 2010-05-24 14:12:16 UTC (rev 105148)
+++ projects/ejb-book/trunk/ch09-secureschool/pom.xml 2010-05-24 14:52:53 UTC (rev 105149)
@@ -27,7 +27,6 @@
<properties>
<!-- Versioning -->
- <version.javax.inject_javax.inject>1</version.javax.inject_javax.inject>
</properties>
@@ -65,9 +64,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
- <version>${version.javax.inject_javax.inject}</version>
<scope>test</scope>
</dependency>
Modified: projects/ejb-book/trunk/chxx-employeeregistry/src/test/java/org/jboss/ejb3/examples/employeeregistry/EmployeeIntegrationTest.java
===================================================================
--- projects/ejb-book/trunk/chxx-employeeregistry/src/test/java/org/jboss/ejb3/examples/employeeregistry/EmployeeIntegrationTest.java 2010-05-24 14:12:16 UTC (rev 105148)
+++ projects/ejb-book/trunk/chxx-employeeregistry/src/test/java/org/jboss/ejb3/examples/employeeregistry/EmployeeIntegrationTest.java 2010-05-24 14:52:53 UTC (rev 105149)
@@ -35,7 +35,7 @@
import javax.persistence.IdClass;
import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.api.RunMode;
+import org.jboss.arquillian.api.Run;
import org.jboss.arquillian.api.RunModeType;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.ejb3.examples.employeeregistry.chxx.entitymanager.SimpleEmployee;
@@ -78,7 +78,7 @@
* @version $Revision: $
*/
@RunWith(Arquillian.class)
- at RunMode(RunModeType.LOCAL)
+ at Run(RunModeType.AS_CLIENT)
public class EmployeeIntegrationTest
{
//-------------------------------------------------------------------------------------||
Modified: projects/ejb-book/trunk/chxx-interceptors/pom.xml
===================================================================
--- projects/ejb-book/trunk/chxx-interceptors/pom.xml 2010-05-24 14:12:16 UTC (rev 105148)
+++ projects/ejb-book/trunk/chxx-interceptors/pom.xml 2010-05-24 14:52:53 UTC (rev 105149)
@@ -69,6 +69,17 @@
<artifactId>arquillian-junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- JUnit -->
<dependency>
<groupId>junit</groupId>
Modified: projects/ejb-book/trunk/chxx-interceptors/src/main/java/org/jboss/ejb3/examples/chxx/tuner/CachingAuditor.java
===================================================================
--- projects/ejb-book/trunk/chxx-interceptors/src/main/java/org/jboss/ejb3/examples/chxx/tuner/CachingAuditor.java 2010-05-24 14:12:16 UTC (rev 105148)
+++ projects/ejb-book/trunk/chxx-interceptors/src/main/java/org/jboss/ejb3/examples/chxx/tuner/CachingAuditor.java 2010-05-24 14:52:53 UTC (rev 105149)
@@ -146,4 +146,12 @@
// Copy on export
return Collections.unmodifiableList(invocations);
}
+
+ /**
+ * Test-only hook to clear the invocations
+ */
+ static void clearInTesting()
+ {
+ invocations.clear();
+ }
}
Modified: projects/ejb-book/trunk/chxx-interceptors/src/test/java/org/jboss/ejb3/examples/chxx/tuner/CachingInterceptorUnitTestCase.java
===================================================================
--- projects/ejb-book/trunk/chxx-interceptors/src/test/java/org/jboss/ejb3/examples/chxx/tuner/CachingInterceptorUnitTestCase.java 2010-05-24 14:12:16 UTC (rev 105148)
+++ projects/ejb-book/trunk/chxx-interceptors/src/test/java/org/jboss/ejb3/examples/chxx/tuner/CachingInterceptorUnitTestCase.java 2010-05-24 14:52:53 UTC (rev 105149)
@@ -203,7 +203,7 @@
}
@Override
- public Class getInvokedBusinessInterface() throws IllegalStateException
+ public Class<?> getInvokedBusinessInterface() throws IllegalStateException
{
throw UNSUPPORTED;
}
Modified: projects/ejb-book/trunk/chxx-interceptors/src/test/java/org/jboss/ejb3/examples/chxx/tuner/Channel2RestrictorUnitTestCase.java
===================================================================
--- projects/ejb-book/trunk/chxx-interceptors/src/test/java/org/jboss/ejb3/examples/chxx/tuner/Channel2RestrictorUnitTestCase.java 2010-05-24 14:12:16 UTC (rev 105148)
+++ projects/ejb-book/trunk/chxx-interceptors/src/test/java/org/jboss/ejb3/examples/chxx/tuner/Channel2RestrictorUnitTestCase.java 2010-05-24 14:52:53 UTC (rev 105149)
@@ -28,10 +28,6 @@
import junit.framework.TestCase;
-import org.jboss.ejb3.examples.chxx.tuner.Channel2AccessPolicy;
-import org.jboss.ejb3.examples.chxx.tuner.Channel2ClosedException;
-import org.jboss.ejb3.examples.chxx.tuner.Channel2Restrictor;
-import org.jboss.ejb3.examples.chxx.tuner.TunerLocalBusiness;
import org.junit.Before;
import org.junit.Test;
Modified: projects/ejb-book/trunk/chxx-interceptors/src/test/java/org/jboss/ejb3/examples/chxx/tuner/InterceptionIntegrationTest.java
===================================================================
--- projects/ejb-book/trunk/chxx-interceptors/src/test/java/org/jboss/ejb3/examples/chxx/tuner/InterceptionIntegrationTest.java 2010-05-24 14:12:16 UTC (rev 105148)
+++ projects/ejb-book/trunk/chxx-interceptors/src/test/java/org/jboss/ejb3/examples/chxx/tuner/InterceptionIntegrationTest.java 2010-05-24 14:52:53 UTC (rev 105149)
@@ -36,6 +36,7 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -80,8 +81,22 @@
*/
@EJB
private TunerLocalBusiness bean;
-
+
//-------------------------------------------------------------------------------------||
+ // Lifecycle --------------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ /**
+ * Cleanup
+ */
+ @After
+ public void clearInvocationsAfterTest()
+ {
+ // Clean up
+ CachingAuditor.clearInTesting();
+ }
+
+ //-------------------------------------------------------------------------------------||
// Tests ------------------------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
Modified: projects/ejb-book/trunk/chxx-poker/src/test/java/org/jboss/ejb3/examples/chxx/transactions/TransactionalPokerGameIntegrationTest.java
===================================================================
--- projects/ejb-book/trunk/chxx-poker/src/test/java/org/jboss/ejb3/examples/chxx/transactions/TransactionalPokerGameIntegrationTest.java 2010-05-24 14:12:16 UTC (rev 105148)
+++ projects/ejb-book/trunk/chxx-poker/src/test/java/org/jboss/ejb3/examples/chxx/transactions/TransactionalPokerGameIntegrationTest.java 2010-05-24 14:52:53 UTC (rev 105149)
@@ -32,7 +32,7 @@
import junit.framework.Assert;
import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.api.RunMode;
+import org.jboss.arquillian.api.Run;
import org.jboss.arquillian.api.RunModeType;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.ejb3.examples.chxx.transactions.api.BankLocalBusiness;
@@ -68,7 +68,7 @@
* @version $Revision: $
*/
@RunWith(Arquillian.class)
- at RunMode(RunModeType.LOCAL)
+ at Run(RunModeType.AS_CLIENT)
public class TransactionalPokerGameIntegrationTest
{
More information about the jboss-cvs-commits
mailing list