[jboss-cvs] JBossAS SVN: r108343 - in branches/infinispan-int: tomcat/src/main/java/org/jboss/web/tomcat/service/session and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 24 15:43:37 EDT 2010
Author: pferraro
Date: 2010-09-24 15:43:36 -0400 (Fri, 24 Sep 2010)
New Revision: 108343
Modified:
branches/infinispan-int/component-matrix/pom.xml
branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java
branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossManager.java
Log:
infinispan 4.2.0.ALPHA2 upgrade, ha-server-ispn, ha-server-cache-spi, ha-server-cache-ispn upgrades
Modified: branches/infinispan-int/component-matrix/pom.xml
===================================================================
--- branches/infinispan-int/component-matrix/pom.xml 2010-09-24 19:23:09 UTC (rev 108342)
+++ branches/infinispan-int/component-matrix/pom.xml 2010-09-24 19:43:36 UTC (rev 108343)
@@ -88,8 +88,7 @@
<version.org.hibernate.entity.manager>${version.org.hibernate}</version.org.hibernate.entity.manager>
<version.org.hibernate.javax.persistence>1.0.0.Final</version.org.hibernate.javax.persistence>
<version.org.hibernate.validator>4.0.2.GA</version.org.hibernate.validator>
- <!--version.org.infinispan>4.1.1-SNAPSHOT</version.org.infinispan-->
- <version.org.infinispan>4.2.0-SNAPSHOT</version.org.infinispan>
+ <version.org.infinispan>4.2.0.ALPHA2</version.org.infinispan>
<version.org.jboss.aop>2.2.1.Alpha3</version.org.jboss.aop>
<version.org.jboss.aspects.currentinvocation>1.0.1</version.org.jboss.aspects.currentinvocation>
<version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
@@ -98,12 +97,12 @@
<version.org.jboss.bootstrap>2.1.0-alpha-5</version.org.jboss.bootstrap>
<version.org.jboss.cl>2.2.0.Alpha8</version.org.jboss.cl>
<version.org.jboss.classpool>1.0.0.Alpha6</version.org.jboss.classpool>
- <version.org.jboss.cluster.cache.spi>3.0.0.Alpha6</version.org.jboss.cluster.cache.spi>
- <version.org.jboss.cluster.cache.ispn>1.0.0.Alpha13</version.org.jboss.cluster.cache.ispn>
+ <version.org.jboss.cluster.cache.spi>3.0.0.Alpha7</version.org.jboss.cluster.cache.spi>
+ <version.org.jboss.cluster.cache.ispn>1.0.0.Alpha14</version.org.jboss.cluster.cache.ispn>
<version.org.jboss.cluster.client>1.1.2.Beta1</version.org.jboss.cluster.client>
<version.org.jboss.cluster.server.api>2.0.0.Alpha6</version.org.jboss.cluster.server.api>
<version.org.jboss.cluster.server.core>1.0.0.Alpha5</version.org.jboss.cluster.server.core>
- <version.org.jboss.cluster.server.ispn>1.0.0.Alpha11</version.org.jboss.cluster.server.ispn>
+ <version.org.jboss.cluster.server.ispn>1.0.0.Alpha12</version.org.jboss.cluster.server.ispn>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.2.0.Alpha7</version.org.jboss.deployers>
<version.org.jboss.ejb3.depchain>1.0.0-alpha-6-SNAPSHOT</version.org.jboss.ejb3.depchain>
@@ -2401,22 +2400,16 @@
</exclusions>
</dependency>
- <!--dependency>
+ <dependency>
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-server-api</artifactId>
<version>${version.org.jboss.cluster.server.api}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency-->
+ </dependency>
<dependency>
<groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-api</artifactId>
- <version>${version.org.jboss.cluster.server.api}</version>
+ <artifactId>jboss-ha-server-cache-spi</artifactId>
+ <version>${version.org.jboss.cluster.cache.spi}</version>
</dependency>
<dependency>
@@ -2436,28 +2429,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-cache-spi</artifactId>
- <version>${version.org.jboss.cluster.cache.spi}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-ispn</artifactId>
- <version>${version.org.jboss.cluster.server.ispn}</version>
- <exclusions>
- <exclusion>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-tree</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
<version>${version.org.infinispan}</version>
@@ -2499,55 +2470,35 @@
<dependency>
<groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-cache-ispn</artifactId>
- <version>${version.org.jboss.cluster.cache.ispn}</version>
+ <artifactId>jboss-ha-server-ispn</artifactId>
+ <version>${version.org.jboss.cluster.server.ispn}</version>
<exclusions>
<exclusion>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-cache-spi</artifactId>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-core</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-ispn</artifactId>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-tree</artifactId>
</exclusion>
</exclusions>
</dependency>
- <!--dependency>
+ <dependency>
<groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-cache-jbc</artifactId>
- <version>${version.org.jboss.cluster.cache.jbc}</version>
+ <artifactId>jboss-ha-server-cache-ispn</artifactId>
+ <version>${version.org.jboss.cluster.cache.ispn}</version>
<exclusions>
<exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
+ <groupId>org.jboss.cluster</groupId>
+ <artifactId>jboss-ha-server-cache-spi</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <groupId>org.jboss.cluster</groupId>
+ <artifactId>jboss-ha-server-ispn</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-pojo</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnp-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
</exclusions>
- </dependency-->
+ </dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
Modified: branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java
===================================================================
--- branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java 2010-09-24 19:23:09 UTC (rev 108342)
+++ branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java 2010-09-24 19:43:36 UTC (rev 108343)
@@ -2339,6 +2339,7 @@
*/
private void processSessionPassivation(String realId)
{
+// log_.info(String.format("processSessionPassivation(%s)", realId));
// get the session from the local map
ClusteredSession<? extends OutgoingDistributableSessionData> session = findLocalSession(realId);
// Remove actively managed session and add to the unloaded sessions
@@ -2387,6 +2388,7 @@
*/
private void processUnloadedSessionPassivation(String realId, OwnedSessionUpdate osu)
{
+// log_.info(String.format("processUnloadedSessionPassivation(%s, %s)", realId, osu.getOwner()));
if (trace_)
{
log_.trace("Passivating session with id: " + realId);
@@ -2557,7 +2559,7 @@
// when it's made. So we catch the exception and fall back
// to adding the valve directly.
// TODO consider skipping adding via JMX and just do it directly
- log_.debug("Caught exception installing valve to Context", e);
+ log_.debug("Caught " + e.toString() + " when installing valve to Context, installing directly");
}
}
@@ -2816,6 +2818,12 @@
return this.proxy_.locate(sessionId);
}
+ @Override
+ public String getEngineName()
+ {
+ return this.getEngine().getName();
+ }
+
/**
* {@inheritDoc}
* @see java.lang.Object#hashCode()
Modified: branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossManager.java
===================================================================
--- branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossManager.java 2010-09-24 19:23:09 UTC (rev 108342)
+++ branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossManager.java 2010-09-24 19:43:36 UTC (rev 108343)
@@ -1352,7 +1352,7 @@
*
* @return an Engine object (or null).
*/
- private Engine getEngine()
+ Engine getEngine()
{
Engine e = null;
for (Container c = getContainer(); e == null && c != null; c = c.getParent())
More information about the jboss-cvs-commits
mailing list