[jboss-cvs] JBossAS SVN: r77119 - in projects/cluster/hibernate-jbc-cacheprovider/trunk: src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/util and 1 other directory.

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

Author: galder.zamarreno at jboss.com
Date: 2008-08-15 12:34:32 -0400 (Fri, 15 Aug 2008)
New Revision: 77119

Modified:
   projects/cluster/hibernate-jbc-cacheprovider/trunk/pom.xml
   projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/util/TestCacheInstanceManager.java
Log:
[JBCLUSTER-206] Updated version to 1.0.0.Beta2 and fixed mbean server registration so that all tests in functional package can be executed one after the other.

Modified: projects/cluster/hibernate-jbc-cacheprovider/trunk/pom.xml
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/pom.xml	2008-08-15 16:25:27 UTC (rev 77118)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/pom.xml	2008-08-15 16:34:32 UTC (rev 77119)
@@ -10,7 +10,7 @@
   <groupId>org.jboss.cluster</groupId>
   <artifactId>hibernate-jbc-cacheprovider</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.0.Beta1</version>
+  <version>1.0.0.Beta2</version>
   <name></name>
   <url>http://www.jboss.org</url>
   <description></description>
@@ -26,7 +26,7 @@
   </organization>
   
   <scm>
-    <connection></connection>
+    <connection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/cluster/hibernate-jbc-cacheprovider/trunk/</connection>
   </scm>
   
   <properties>
@@ -49,16 +49,7 @@
     <version.javassist>3.8.1.GA</version.javassist>
     <version.jboss.javaee.persistence.api>3.0.0.CR1</version.jboss.javaee.persistence.api>
     <version.jboss.serialization>1.0.3.GA</version.jboss.serialization>
-    <version.trove>1.0.2</version.trove>
-    <!-- 
-    <version.hibernate.testing>3.3.0.CR1</version.hibernate.testing>
-    <version.slf4j.log4j12>1.4.2</version.slf4j.log4j12>
-    <version.hibernate.annotations>3.2.1.GA</version.hibernate.annotations>
-    <version.hibernate.entitymanager>3.2.1.GA</version.hibernate.entitymanager>
-    <version.jboss.ejb3>4.2.2.GA</version.jboss.ejb3>
-    <version.jboss.aop>1.5.6.GA</version.jboss.aop>
-     -->
-     
+    <version.trove>1.0.2</version.trove>     
   </properties>
   
   <build>
@@ -69,7 +60,7 @@
           <!-- The tagBase property is needed during the release process so that
             the maven release plugin will create the release tag in the 
             appropriate location. -->
-          <tagBase></tagBase>
+          <tagBase>https://svn.jboss.org/repos/jbossas/projects/cluster/hibernate-jbc-cacheprovider/tags</tagBase>
         </configuration>
       </plugin>     
     </plugins>
@@ -111,28 +102,6 @@
        <artifactId>jboss-transaction</artifactId>
        <version>${version.jboss.transaction}</version>
     </dependency>
-    <!-- 
-    <dependency>
-       <groupId>hibernate-annotations</groupId>
-       <artifactId>hibernate-annotations</artifactId>
-       <version>${version.hibernate.annotations}</version>
-    </dependency>
-    <dependency>
-       <groupId>hibernate-entitymanager</groupId>
-       <artifactId>hibernate-entitymanager</artifactId>
-       <version>${version.hibernate.entitymanager}</version>
-    </dependency>    
-    <dependency>
-       <groupId>jboss</groupId>
-       <artifactId>jboss-ejb3</artifactId>
-       <version>${version.jboss.ejb3}</version>
-    </dependency>
-    <dependency>
-       <groupId>jboss.aop</groupId>
-       <artifactId>jboss-aop-jdk50</artifactId>
-       <version>${version.jboss.aop}</version>
-    </dependency>
-    -->  
 
     <!-- test dependencies -->
     <dependency>
@@ -213,32 +182,6 @@
        <version>${version.trove}</version>
        <scope>test</scope>
     </dependency>        
-    <!-- dependency>
-       <groupId>org.hibernate</groupId>
-       <artifactId>hibernate-testing</artifactId>
-       <version>${version.hibernate.testing}</version>
-       <scope>test</scope>
-    </dependency>
-    <dependency>
-       <groupId>org.slf4j</groupId>
-       <artifactId>slf4j-log4j12</artifactId>
-       <version>${version.slf4j.log4j12}</version>
-       <scope>test</scope>
-    </dependency>
-    <dependency>
-       <groupId>commons-logging</groupId>
-       <artifactId>commons-logging</artifactId>
-       <version>${version.commons.logging}</version>
-       <scope>test</scope>
-    </dependency>
-    <dependency>
-       <groupId>commons-logging</groupId>
-       <artifactId>commons-logging-api</artifactId>
-       <version>${version.commons.logging}</version>
-       <scope>test</scope>
-    </dependency> 
-    -->
-        
   </dependencies>  
 
 </project>

Modified: projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/util/TestCacheInstanceManager.java
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/util/TestCacheInstanceManager.java	2008-08-15 16:25:27 UTC (rev 77118)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/util/TestCacheInstanceManager.java	2008-08-15 16:34:32 UTC (rev 77119)
@@ -161,7 +161,14 @@
              * will return the transaction manager that Hibernate will use */
             cache.setTransactionManagerLookup(new TransactionManagerLookupAdaptor(transactionManagerLookup, cfg.getProperties()));
          }
-         mbs.registerMBean(cache, new ObjectName(CACHE_MBEAN_NAME_STARTS_WITH + id));          
+         
+         ObjectName name = new ObjectName(CACHE_MBEAN_NAME_STARTS_WITH + id);
+         if (mbs.isRegistered(name))
+         {
+            mbs.unregisterMBean(name);
+         }
+         mbs.registerMBean(cache, name);
+         
          cache.startService();
          return cache;
       }