[jboss-cvs] JBossAS SVN: r93987 - in projects/ejb3/trunk/transactions: src/test/java/org/jboss/ejb3/test/tx/getrollback/unit and 1 other directory.

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

Author: wolfc
Date: 2009-09-24 09:15:40 -0400 (Thu, 24 Sep 2009)
New Revision: 93987

Modified:
   projects/ejb3/trunk/transactions/pom.xml
   projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/getrollback/unit/GetRollbackTestCase.java
Log:
EJBTHREE-1929: renamed method which appeared in the new interceptors component and made the dependency version dynamic


Modified: projects/ejb3/trunk/transactions/pom.xml
===================================================================
--- projects/ejb3/trunk/transactions/pom.xml	2009-09-24 13:13:39 UTC (rev 93986)
+++ projects/ejb3/trunk/transactions/pom.xml	2009-09-24 13:15:40 UTC (rev 93987)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.ejb3</groupId>
     <artifactId>jboss-ejb3-build</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.5-SNAPSHOT</version>
     <relativePath>../build/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -131,7 +131,7 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-interceptors</artifactId>
-      <version>1.0.0</version>
+      <version>${version.org.jboss.ejb3.jboss-ejb3-interceptors}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.integration</groupId>
@@ -193,4 +193,22 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>default</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <version.org.jboss.ejb3.jboss-ejb3-interceptors>1.0.0</version.org.jboss.ejb3.jboss-ejb3-interceptors>
+      </properties>
+    </profile>
+    <profile>
+      <id>CI</id>
+      <properties>
+        <version.org.jboss.ejb3.jboss-ejb3-interceptors>[0,)</version.org.jboss.ejb3.jboss-ejb3-interceptors>
+      </properties>
+    </profile>
+  </profiles>
 </project>

Modified: projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/getrollback/unit/GetRollbackTestCase.java
===================================================================
--- projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/getrollback/unit/GetRollbackTestCase.java	2009-09-24 13:13:39 UTC (rev 93986)
+++ projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/getrollback/unit/GetRollbackTestCase.java	2009-09-24 13:15:40 UTC (rev 93987)
@@ -71,11 +71,13 @@
       /**
        * Emulate a callback invocation. The real thing is still in ejb3-core.
        * 
+       * @deprecated ejb3-interceptors 1.0.5 introduces a method with the same signature and similar functionality (TODO: refactor this class)
        * @param component
        * @param lifecycleAnnotationType
        * @throws Throwable
        */
-      protected void invokeCallback(BeanContext<?> component, Class<? extends Annotation> lifecycleAnnotationType) throws Throwable
+      @Deprecated
+      protected void invokeCallbackDeprecated(BeanContext<?> component, Class<? extends Annotation> lifecycleAnnotationType) throws Throwable
       {
          List<Class<?>> lifecycleInterceptorClasses = getInterceptorRegistry().getLifecycleInterceptorClasses();
          Advisor advisor = getAdvisor();
@@ -214,7 +216,7 @@
       tm.begin();
       try
       {
-         container.invokeCallback(instance, PrePassivate.class);
+         container.invokeCallbackDeprecated(instance, PrePassivate.class);
          
          assertTrue(instance.getInstance().prePassivateRan);
       }