[jboss-cvs] JBossAS SVN: r108379 - in projects/ejb3/branches/infinispan-int/core: .settings and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 29 15:48:58 EDT 2010
Author: pferraro
Date: 2010-09-29 15:48:57 -0400 (Wed, 29 Sep 2010)
New Revision: 108379
Removed:
projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/cache/infinispan/
projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/cache/simple/
projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/cache/tree/
projects/ejb3/branches/infinispan-int/core/src/test/java/org/jboss/ejb3/cache/infinispan/
Modified:
projects/ejb3/branches/infinispan-int/core/.classpath
projects/ejb3/branches/infinispan-int/core/.project
projects/ejb3/branches/infinispan-int/core/.settings/org.eclipse.jdt.core.prefs
projects/ejb3/branches/infinispan-int/core/.settings/org.maven.ide.eclipse.prefs
projects/ejb3/branches/infinispan-int/core/pom.xml
projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/entity/PersistenceXmlLoader.java
projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/entity/SecondLevelCacheUtil.java
projects/ejb3/branches/infinispan-int/core/src/main/resources/ejb3-interceptors-aop.xml
projects/ejb3/branches/infinispan-int/core/src/test/java/org/jboss/ejb3/core/test/common/MockEjb3Deployment.java
Log:
Refactor stateful cache providers into separate modules.
Modified: projects/ejb3/branches/infinispan-int/core/.classpath
===================================================================
--- projects/ejb3/branches/infinispan-int/core/.classpath 2010-09-29 15:51:41 UTC (rev 108378)
+++ projects/ejb3/branches/infinispan-int/core/.classpath 2010-09-29 19:48:57 UTC (rev 108379)
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="eclipse-target/tests-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="eclipse-target/tests-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="eclipse-target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/tests-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/ejb3/branches/infinispan-int/core/.project
===================================================================
--- projects/ejb3/branches/infinispan-int/core/.project 2010-09-29 15:51:41 UTC (rev 108378)
+++ projects/ejb3/branches/infinispan-int/core/.project 2010-09-29 19:48:57 UTC (rev 108379)
@@ -1,19 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-ejb3-core</name>
- <comment>JBoss EJB 3.0 Core</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- <!--
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- </buildCommand>
- -->
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <name>jboss-ejb3-core</name>
+ <comment>JBoss EJB 3.0 Core</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: projects/ejb3/branches/infinispan-int/core/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/ejb3/branches/infinispan-int/core/.settings/org.eclipse.jdt.core.prefs 2010-09-29 15:51:41 UTC (rev 108378)
+++ projects/ejb3/branches/infinispan-int/core/.settings/org.eclipse.jdt.core.prefs 2010-09-29 19:48:57 UTC (rev 108379)
@@ -1,5 +1,6 @@
-#Wed Nov 12 19:05:29 GMT-05:00 2008
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+#Thu Aug 05 11:46:02 EDT 2010
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
Modified: projects/ejb3/branches/infinispan-int/core/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/ejb3/branches/infinispan-int/core/.settings/org.maven.ide.eclipse.prefs 2010-09-29 15:51:41 UTC (rev 108378)
+++ projects/ejb3/branches/infinispan-int/core/.settings/org.maven.ide.eclipse.prefs 2010-09-29 19:48:57 UTC (rev 108379)
@@ -1,9 +1,9 @@
-#Fri Oct 02 12:42:17 CEST 2009
-activeProfiles=eclipse,JPA-2.0
+#Thu Aug 05 11:45:37 EDT 2010
+activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
includeModules=false
-resolveWorkspaceProjects=false
+resolveWorkspaceProjects=true
resourceFilterGoals=process-resources resources\:testResources
skipCompilerPlugin=true
version=1
Modified: projects/ejb3/branches/infinispan-int/core/pom.xml
===================================================================
--- projects/ejb3/branches/infinispan-int/core/pom.xml 2010-09-29 15:51:41 UTC (rev 108378)
+++ projects/ejb3/branches/infinispan-int/core/pom.xml 2010-09-29 19:48:57 UTC (rev 108379)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.13</version>
+ <version>1.0.14-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -17,7 +17,7 @@
<!-- Artifact Information -->
<artifactId>jboss-ejb3-core</artifactId>
<packaging>jar</packaging>
- <version>1.5.1</version>
+ <version>1.5.3-SNAPSHOT</version>
<name>JBoss EJB 3.0 Core</name>
<url>http://labs.jboss.com/jbossejb3</url>
<description>JBoss EJB 3.0 Core</description>
@@ -234,13 +234,6 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
- <!-- Needed for PersistenceXmlLoader -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
-
<!--
<dependency>
<groupId>org.jboss.test</groupId>
@@ -294,7 +287,25 @@
<scope>test</scope>
</dependency>
+ <!--dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>3.1.0.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency-->
<dependency>
+ <groupId>org.jboss.ejb3.statefulcache</groupId>
+ <artifactId>jboss-ejb3-statefulcache-simple</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-aspects-test</artifactId>
<version>1.0.0.Beta1</version>
@@ -320,7 +331,7 @@
<dependency>
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-client</artifactId>
- <version>1.1.2.Beta1</version>
+ <version>1.1.1.GA</version>
<exclusions>
<exclusion>
<groupId>org.jboss.aspects</groupId>
@@ -340,7 +351,7 @@
<dependency>
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-server-api</artifactId>
- <version>2.0.0.Alpha6</version>
+ <version>1.1.1.GA</version>
<exclusions>
<exclusion>
<groupId>org.jboss</groupId>
@@ -350,35 +361,17 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-cache-jbc</artifactId>
- <version>3.0.0.Alpha4</version>
- <optional>true</optional>
- <exclusions>
<exclusion>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-cache-spi</artifactId>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-core</artifactId>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-pojo</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-ispn</artifactId>
- <version>1.0.0.Alpha11</version>
- <optional>true</optional>
- <exclusions>
<exclusion>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-tree</artifactId>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -798,12 +791,5 @@
<artifactId>trove</artifactId>
</dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/entity/PersistenceXmlLoader.java
===================================================================
--- projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/entity/PersistenceXmlLoader.java 2010-09-29 15:51:41 UTC (rev 108378)
+++ projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/entity/PersistenceXmlLoader.java 2010-09-29 19:48:57 UTC (rev 108379)
@@ -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/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/entity/SecondLevelCacheUtil.java
===================================================================
--- projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/entity/SecondLevelCacheUtil.java 2010-09-29 15:51:41 UTC (rev 108378)
+++ projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/entity/SecondLevelCacheUtil.java 2010-09-29 19:48:57 UTC (rev 108379)
@@ -22,6 +22,10 @@
package org.jboss.ejb3.entity;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
import org.hibernate.cache.CacheException;
import org.hibernate.cache.StandardQueryCache;
import org.hibernate.cache.UpdateTimestampsCache;
@@ -34,6 +38,7 @@
public class SecondLevelCacheUtil
{
public static final String HIBERNATE_CACHE_REGION_PREFIX = "hibernate.cache.region_prefix";
+ private static final Set<String> CACHE_EXCEPTIONS = new HashSet<String>(Arrays.asList("org.jboss.cache.CacheException", "org.infinispan.CacheException"));
public static String createCacheRegionPrefix(String earName, String jarName, String unitName)
{
@@ -99,10 +104,11 @@
public static CacheException convertToHibernateException(Exception e)
{
CacheException he = null;
+ Class<?> exceptionClass = e.getClass();
- if (e instanceof org.jboss.cache.CacheException)
+ if (isCacheException(exceptionClass))
{
- he = new CacheException(e.getClass().getName() + " " + e.getMessage());
+ he = new CacheException(exceptionClass.getName() + " " + e.getMessage());
he.setStackTrace(e.getStackTrace());
}
else if (e instanceof CacheException)
@@ -117,6 +123,11 @@
return he;
}
+ private static boolean isCacheException(Class<?> exceptionClass)
+ {
+ return (exceptionClass != null) && !exceptionClass.equals(Object.class) ? CACHE_EXCEPTIONS.contains(exceptionClass.getName()) || isCacheException(exceptionClass.getSuperclass()) : false;
+ }
+
// Prevent instantiation
private SecondLevelCacheUtil() {}
}
Modified: projects/ejb3/branches/infinispan-int/core/src/main/resources/ejb3-interceptors-aop.xml
===================================================================
--- projects/ejb3/branches/infinispan-int/core/src/main/resources/ejb3-interceptors-aop.xml 2010-09-29 15:51:41 UTC (rev 108378)
+++ projects/ejb3/branches/infinispan-int/core/src/main/resources/ejb3-interceptors-aop.xml 2010-09-29 19:48:57 UTC (rev 108379)
@@ -325,7 +325,7 @@
@org.jboss.ejb3.annotation.Cache ("DistributedCache")
</annotation>
<annotation expr="class(*) AND !class(@org.jboss.ejb3.annotation.CacheConfig) AND class(@org.jboss.ejb3.annotation.Clustered)">
- @org.jboss.ejb3.annotation.CacheConfig (name="sfsb:default", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ @org.jboss.ejb3.annotation.CacheConfig (name="sfsb", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
</domain>
@@ -388,7 +388,7 @@
@org.jboss.ejb3.annotation.Cache ("DistributedCache")
</annotation>
<annotation expr="class(*) AND !class(@org.jboss.ejb3.annotation.CacheConfig) AND class(@org.jboss.ejb3.annotation.Clustered)">
- @org.jboss.ejb3.annotation.CacheConfig (name="sfsb:default", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ @org.jboss.ejb3.annotation.CacheConfig (name="sfsb", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
</domain>
Modified: projects/ejb3/branches/infinispan-int/core/src/test/java/org/jboss/ejb3/core/test/common/MockEjb3Deployment.java
===================================================================
--- projects/ejb3/branches/infinispan-int/core/src/test/java/org/jboss/ejb3/core/test/common/MockEjb3Deployment.java 2010-09-29 15:51:41 UTC (rev 108378)
+++ projects/ejb3/branches/infinispan-int/core/src/test/java/org/jboss/ejb3/core/test/common/MockEjb3Deployment.java 2010-09-29 19:48:57 UTC (rev 108379)
@@ -109,7 +109,7 @@
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);
+// cacheFactories.put("StatefulTreeCache", StatefulTreeCacheFactory.class);
cacheRegistry.setFactories(cacheFactories);
setCacheFactoryRegistry(cacheRegistry);
More information about the jboss-cvs-commits
mailing list