[jboss-cvs] JBossAS SVN: r107342 - in branches/infinispan-int/tomcat: src/main/java/org/jboss/web/tomcat/service/session and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 2 16:48:08 EDT 2010
Author: pferraro
Date: 2010-08-02 16:48:08 -0400 (Mon, 02 Aug 2010)
New Revision: 107342
Modified:
branches/infinispan-int/tomcat/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/persistent/PersistentStoreDistributedCacheManager.java
branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/persistent/RDBMSStoreBase.java
Log:
Updated dependencies for infinispan integration.
Modified: branches/infinispan-int/tomcat/pom.xml
===================================================================
--- branches/infinispan-int/tomcat/pom.xml 2010-08-02 20:46:37 UTC (rev 107341)
+++ branches/infinispan-int/tomcat/pom.xml 2010-08-02 20:48:08 UTC (rev 107342)
@@ -217,10 +217,6 @@
<artifactId>jasper-jdt</artifactId>
</dependency>
<dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -372,23 +368,9 @@
</dependency>
<dependency>
<groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-server-cache-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-cache-jbc</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-iiop</artifactId>
</dependency>
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-08-02 20:46:37 UTC (rev 107341)
+++ branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java 2010-08-02 20:48:08 UTC (rev 107342)
@@ -28,6 +28,7 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
+import java.util.ServiceLoader;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
@@ -67,7 +68,6 @@
import org.jboss.web.tomcat.service.session.distributedcache.spi.DistributableSessionMetadata;
import org.jboss.web.tomcat.service.session.distributedcache.spi.DistributedCacheManager;
import org.jboss.web.tomcat.service.session.distributedcache.spi.DistributedCacheManagerFactory;
-import org.jboss.web.tomcat.service.session.distributedcache.spi.DistributedCacheManagerFactoryFactory;
import org.jboss.web.tomcat.service.session.distributedcache.spi.IncomingDistributableSessionData;
import org.jboss.web.tomcat.service.session.distributedcache.spi.LocalDistributableSessionManager;
import org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingAttributeGranularitySessionData;
@@ -180,9 +180,18 @@
public JBossCacheManager() throws ClusteringNotSupportedException
{
- this(DistributedCacheManagerFactoryFactory.getInstance().getDistributedCacheManagerFactory());
+ this(getDistributedCacheManagerFactory());
}
+ private static DistributedCacheManagerFactory getDistributedCacheManagerFactory() throws ClusteringNotSupportedException
+ {
+ for (DistributedCacheManagerFactory factory: ServiceLoader.load(DistributedCacheManagerFactory.class))
+ {
+ return factory;
+ }
+ throw new ClusteringNotSupportedException("No DistributedCacheManagerFactory service provider found.");
+ }
+
public JBossCacheManager(DistributedCacheManagerFactory distributedManagerFactory)
{
assert distributedManagerFactory != null : "distributedManagerFactory is null";
@@ -1738,7 +1747,8 @@
{
duplicates_.incrementAndGet();
}
- else
+ // Make sure that generated id will cache locally
+ else if (this.proxy_.isLocal(id))
{
return id;
}
@@ -2482,6 +2492,7 @@
protected void configureUnembedded() throws LifecycleException
{
+/*
if (snapshotMode_ == null)
{
// We were not instantiated by a JBossCacheCluster, so we need to
@@ -2502,6 +2513,7 @@
throw new LifecycleException(msg, e);
}
}
+*/
}
private void synthesizeReplicationConfig()
@@ -2749,15 +2761,15 @@
}
@SuppressWarnings("unchecked")
- private static <T extends OutgoingDistributableSessionData> JBossCacheManager<T> uncheckedCastManager(JBossCacheManager mgr)
+ private static <T extends OutgoingDistributableSessionData> JBossCacheManager<T> uncheckedCastManager(JBossCacheManager<?> mgr)
{
- return mgr;
+ return (JBossCacheManager<T>) mgr;
}
@SuppressWarnings("unchecked")
private static ClusteredSession<? extends OutgoingDistributableSessionData> uncheckedCastSession(Session session)
{
- return (ClusteredSession) session;
+ return (ClusteredSession<? extends OutgoingDistributableSessionData>) session;
}
/**
Modified: branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/persistent/PersistentStoreDistributedCacheManager.java
===================================================================
--- branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/persistent/PersistentStoreDistributedCacheManager.java 2010-08-02 20:46:37 UTC (rev 107341)
+++ branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/persistent/PersistentStoreDistributedCacheManager.java 2010-08-02 20:48:08 UTC (rev 107342)
@@ -25,11 +25,11 @@
import java.util.Map;
import java.util.Set;
-import org.jboss.metadata.web.jboss.ReplicationGranularity;
import org.jboss.web.tomcat.service.session.distributedcache.spi.BatchingManager;
import org.jboss.web.tomcat.service.session.distributedcache.spi.DistributableSessionMetadata;
import org.jboss.web.tomcat.service.session.distributedcache.spi.IncomingDistributableSessionData;
import org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingSessionGranularitySessionData;
+import org.jboss.web.tomcat.service.session.distributedcache.spi.SessionOwnershipSupport;
/**
*
@@ -38,8 +38,7 @@
*
* @version $Revision: $
*/
-public class PersistentStoreDistributedCacheManager
- implements ExtendedDistributedCacheManager<OutgoingSessionGranularitySessionData>
+public class PersistentStoreDistributedCacheManager implements ExtendedDistributedCacheManager<OutgoingSessionGranularitySessionData>
{
private static final BatchingManager BATCH_MGR = new NoOpBatchingManager();
@@ -147,59 +146,18 @@
{
store.storeSessionData(sessionData);
}
-
- public boolean getSupportsAttributeOperations()
- {
- return false;
- }
-
- public Object getAttribute(String realId, String key)
- {
- throw new UnsupportedOperationException("Attribute operations not supported " +
- "with ReplicationGranularity " + ReplicationGranularity.SESSION);
- }
-
- public Set<String> getAttributeKeys(String realId)
- {
- throw new UnsupportedOperationException("Attribute operations not supported " +
- "with ReplicationGranularity " + ReplicationGranularity.SESSION);
- }
-
- public Map<String, Object> getAttributes(String realId)
- {
- throw new UnsupportedOperationException("Attribute operations not supported " +
- "with ReplicationGranularity " + ReplicationGranularity.SESSION);
- }
-
- public void putAttribute(String realId, Map<String, Object> map)
- {
- throw new UnsupportedOperationException("Attribute operations not supported " +
- "with ReplicationGranularity " + ReplicationGranularity.SESSION);
- }
-
- public void putAttribute(String realId, String key, Object value)
- {
- throw new UnsupportedOperationException("Attribute operations not supported " +
- "with ReplicationGranularity " + ReplicationGranularity.SESSION);
- }
-
- public Object removeAttribute(String realId, String key)
- {
- throw new UnsupportedOperationException("Attribute operations not supported " +
- "with ReplicationGranularity " + ReplicationGranularity.SESSION);
- }
-
- public void removeAttributeLocal(String realId, String key)
- {
- throw new UnsupportedOperationException("Attribute operations not supported " +
- "with ReplicationGranularity " + ReplicationGranularity.SESSION);
- }
public void setForceSynchronous(boolean forceSynchronous)
{
// Do nothing
}
+ @Override
+ public boolean isLocal(String realId)
+ {
+ return true;
+ }
+
public static class NoOpBatchingManager implements BatchingManager
{
public boolean isBatchInProgress() throws Exception
@@ -279,4 +237,8 @@
}
+ public SessionOwnershipSupport getSessionOwnershipSupport()
+ {
+ return null;
+ }
}
Modified: branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/persistent/RDBMSStoreBase.java
===================================================================
--- branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/persistent/RDBMSStoreBase.java 2010-08-02 20:46:37 UTC (rev 107341)
+++ branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/persistent/RDBMSStoreBase.java 2010-08-02 20:48:08 UTC (rev 107342)
@@ -28,7 +28,6 @@
import org.jboss.web.tomcat.service.session.distributedcache.spi.DistributableSessionMetadata;
import org.jboss.web.tomcat.service.session.distributedcache.spi.IncomingDistributableSessionData;
import org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingSessionGranularitySessionData;
-import org.jboss.web.tomcat.service.session.distributedcache.spi.SessionSerializationFactory;
/**
* Abstract superclass for {@link PersistentStore} implementations that store in a
@@ -197,8 +196,7 @@
{
try
{
- @SuppressWarnings("unchecked")
- Object empty = new SimpleCachableMarshalledValue(new HashMap());
+ Object empty = new SimpleCachableMarshalledValue(new HashMap<String, Object>());
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(empty);
@@ -784,7 +782,6 @@
BufferedInputStream attributes_bis = new BufferedInputStream(rst.getBinaryStream(8));
attributes_ois = new ObjectInputStream(attributes_bis);
SimpleCachableMarshalledValue mv = (SimpleCachableMarshalledValue) attributes_ois.readObject();
- mv.setObjectStreamSource(SessionSerializationFactory.getObjectStreamSource());
attributes = uncheckedCast(mv.get());
}
More information about the jboss-cvs-commits
mailing list