[jboss-cvs] JBossAS SVN: r108907 - in projects/ejb3/trunk/core: src/main/java/org/jboss/ejb3/cache and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 25 14:04:43 EDT 2010
Author: pferraro
Date: 2010-10-25 14:04:43 -0400 (Mon, 25 Oct 2010)
New Revision: 108907
Removed:
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/tree/
Modified:
projects/ejb3/trunk/core/pom.xml
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/entity/PersistenceXmlLoader.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/entity/SecondLevelCacheUtil.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/MockEjb3Deployment.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/unit/CachePassivationUnitTestCase.java
projects/ejb3/trunk/core/src/test/resources/statefulcontainer-beans.xml
Log:
Refactored org.jboss.ejb3.cache.tree into git://github.com/jbossejb3/jboss-ejb3-statefulcache.git jbosscache module.
Dropped jbosscache dependency.
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2010-10-25 17:06:11 UTC (rev 108906)
+++ projects/ejb3/trunk/core/pom.xml 2010-10-25 18:04:43 UTC (rev 108907)
@@ -288,19 +288,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <!-- not used anywhere else -->
- <version>3.1.0.GA</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-aspects-test</artifactId>
<version>1.0.0.Beta1</version>
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/entity/PersistenceXmlLoader.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/entity/PersistenceXmlLoader.java 2010-10-25 17:06:11 UTC (rev 108906)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/entity/PersistenceXmlLoader.java 2010-10-25 18:04:43 UTC (rev 108907)
@@ -21,8 +21,6 @@
*/
package org.jboss.ejb3.entity;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -37,6 +35,7 @@
import org.hibernate.ejb.util.ConfigurationHelper;
import org.hibernate.util.StringHelper;
import org.hibernate.cfg.EJB3DTDEntityResolver;
+import org.jboss.logging.Logger;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
@@ -61,7 +60,7 @@
@Deprecated
public final class PersistenceXmlLoader
{
- private static Log log = LogFactory.getLog( PersistenceXmlLoader.class );
+ private static Logger log = Logger.getLogger( PersistenceXmlLoader.class );
private PersistenceXmlLoader() {
}
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/entity/SecondLevelCacheUtil.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/entity/SecondLevelCacheUtil.java 2010-10-25 17:06:11 UTC (rev 108906)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/entity/SecondLevelCacheUtil.java 2010-10-25 18:04:43 UTC (rev 108907)
@@ -31,9 +31,11 @@
*
* @author Brian Stansberry
*/
+ at Deprecated
public class SecondLevelCacheUtil
{
public static final String HIBERNATE_CACHE_REGION_PREFIX = "hibernate.cache.region_prefix";
+ private static final String CACHE_EXCEPTION = "org.jboss.cache.CacheException";
public static String createCacheRegionPrefix(String earName, String jarName, String unitName)
{
@@ -100,7 +102,7 @@
{
CacheException he = null;
- if (e instanceof org.jboss.cache.CacheException)
+ if (e.getClass().getName().equals(CACHE_EXCEPTION) || e.getClass().getSuperclass().getName().equals(CACHE_EXCEPTION))
{
he = new CacheException(e.getClass().getName() + " " + e.getMessage());
he.setStackTrace(e.getStackTrace());
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/MockEjb3Deployment.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/MockEjb3Deployment.java 2010-10-25 17:06:11 UTC (rev 108906)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/MockEjb3Deployment.java 2010-10-25 18:04:43 UTC (rev 108907)
@@ -37,7 +37,6 @@
import org.jboss.ejb3.cache.Ejb3CacheFactory;
import org.jboss.ejb3.cache.NoPassivationCacheFactory;
import org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory;
-import org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory;
import org.jboss.ejb3.common.resolvers.plugins.FirstMatchEjbReferenceResolver;
import org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver;
import org.jboss.ejb3.deployers.JBoss5DependencyPolicy;
@@ -109,10 +108,8 @@
HashMap<String, Class<? extends Ejb3CacheFactory>> cacheFactories = new HashMap<String, Class<? extends Ejb3CacheFactory>>();
cacheFactories.put("NoPassivationCache", NoPassivationCacheFactory.class);
cacheFactories.put("SimpleStatefulCache", SimpleStatefulCacheFactory.class);
- cacheFactories.put("StatefulTreeCache", StatefulTreeCacheFactory.class);
cacheRegistry.setFactories(cacheFactories);
setCacheFactoryRegistry(cacheRegistry);
-
}
@Override
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/unit/CachePassivationUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/unit/CachePassivationUnitTestCase.java 2010-10-25 17:06:11 UTC (rev 108906)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/unit/CachePassivationUnitTestCase.java 2010-10-25 18:04:43 UTC (rev 108907)
@@ -21,7 +21,20 @@
*/
package org.jboss.ejb3.test.cachepassivation.unit;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import javax.naming.InitialContext;
+import javax.transaction.TransactionManager;
+
import junit.framework.TestCase;
+
import org.jboss.aop.AspectManager;
import org.jboss.aop.Domain;
import org.jboss.aop.advice.AdviceFactory;
@@ -31,7 +44,6 @@
import org.jboss.aop.advice.InterceptorFactory;
import org.jboss.aop.advice.Scope;
import org.jboss.aspects.currentinvocation.CurrentInvocationInterceptor;
-import org.jboss.cache.transaction.DummyTransactionManager;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.Ejb3Registry;
import org.jboss.ejb3.cache.persistence.PersistenceManagerFactory;
@@ -50,16 +62,8 @@
import org.jboss.naming.JavaCompInitializer;
import org.jnp.server.SingletonNamingServer;
import org.junit.AfterClass;
+import org.mockito.Mockito;
-import javax.naming.InitialContext;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
/**
* Comment
*
@@ -89,9 +93,8 @@
new EJBContextBinder().start();
- DummyTransactionManager tm = new DummyTransactionManager();
InitialContext ic = new InitialContext(ctxProperties);
- ic.bind("java:/TransactionManager", tm);
+ ic.bind("java:/TransactionManager", Mockito.mock(SerializableTransactionManager.class));
EmbeddedTestMcBootstrap bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
Ejb3RegistrarLocator.bindRegistrar(new Ejb3McRegistrar(bootstrap.getKernel()));
@@ -164,4 +167,8 @@
// Ejb3Registry.unregister(container);
}
}
+
+ public static interface SerializableTransactionManager extends TransactionManager, Serializable
+ {
+ }
}
Modified: projects/ejb3/trunk/core/src/test/resources/statefulcontainer-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/statefulcontainer-beans.xml 2010-10-25 17:06:11 UTC (rev 108906)
+++ projects/ejb3/trunk/core/src/test/resources/statefulcontainer-beans.xml 2010-10-25 18:04:43 UTC (rev 108907)
@@ -31,11 +31,6 @@
<key>SimpleStatefulCache</key>
<value>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</value>
</entry>
- <!-- StatefulTreeCache -->
- <entry>
- <key>StatefulTreeCache</key>
- <value>org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory</value>
- </entry>
</map>
</property>
</bean>
More information about the jboss-cvs-commits
mailing list