[jboss-cvs] JBossAS SVN: r106994 - in projects/cluster/ha-server-cache-spi/trunk: src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 21 14:00:25 EDT 2010
Author: pferraro
Date: 2010-07-21 14:00:24 -0400 (Wed, 21 Jul 2010)
New Revision: 106994
Removed:
projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/JBossSerializationObjectStreamSource.java
projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/SessionSerializationFactory.java
projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterConfig.java
projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterDistributedCacheManagerFactory.java
Modified:
projects/cluster/ha-server-cache-spi/trunk/pom.xml
projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/DistributedCacheManagerFactoryFactory.java
Log:
Drop dependency on jboss-serialization.
Drop TomcatClusterConfig support.
Modified: projects/cluster/ha-server-cache-spi/trunk/pom.xml
===================================================================
--- projects/cluster/ha-server-cache-spi/trunk/pom.xml 2010-07-21 16:58:27 UTC (rev 106993)
+++ projects/cluster/ha-server-cache-spi/trunk/pom.xml 2010-07-21 18:00:24 UTC (rev 106994)
@@ -30,14 +30,10 @@
</scm>
<properties>
- <version.jboss.ha.server.api>1.1.2.Final</version.jboss.ha.server.api>
- <!-- This should be [2.6.2,3.0.0) but maven complains about it -->
- <version.jgroups>2.6.15.GA</version.jgroups>
- <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
+ <version.jboss.ha.server.api>2.0.0.Alpha5</version.jboss.ha.server.api>
+ <version.jgroups>2.10.0.GA</version.jgroups>
<version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
- <version.jboss.serialization>1.0.3.GA</version.jboss.serialization>
<version.org.jboss.metadata.war>2.0.0.Alpha14</version.org.jboss.metadata.war>
- <version.junit>3.8.1</version.junit>
</properties>
<build>
@@ -60,15 +56,16 @@
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-server-api</artifactId>
<version>${version.jboss.ha.server.api}</version>
- <exclusions>
+ <exclusions>
<exclusion>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-client</artifactId>
</exclusion>
+ <!-- Remove this exclusion after jgroups upgrade to 2.10.0.GA -->
<exclusion>
<groupId>jgroups</groupId>
<artifactId>jgroups</artifactId>
@@ -76,58 +73,25 @@
</exclusions>
</dependency>
+ <!-- Remove this dependency after ha-server-api upgrade to jgroups 2.10.0.GA -->
<dependency>
- <groupId>jgroups</groupId>
+ <groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
<version>${version.jgroups}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging.spi}</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnp-client</artifactId>
<version>${version.org.jboss.naming}</version>
</dependency>
-
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-serialization</artifactId>
- <version>${version.jboss.serialization}</version>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-war</artifactId>
<version>${version.org.jboss.metadata.war}</version>
</dependency>
- <!-- Test dependencies -->
- <!--
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>test</scope>
- </dependency>
- -->
-
</dependencies>
</project>
Modified: projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/DistributedCacheManagerFactoryFactory.java
===================================================================
--- projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/DistributedCacheManagerFactoryFactory.java 2010-07-21 16:58:27 UTC (rev 106993)
+++ projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/DistributedCacheManagerFactoryFactory.java 2010-07-21 18:00:24 UTC (rev 106994)
@@ -24,8 +24,6 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.util.HashMap;
-import java.util.Map;
/**
* Factory for obtaining a DistributedCacheManagerFactory.
@@ -51,8 +49,6 @@
private DistributedCacheManagerFactory distributedCacheManagerFactory;
private String factoryClassName = DEFAULT_CLASS_NAME;
- private Map<TomcatClusterConfig, TomcatClusterDistributedCacheManagerFactory> tomcatClusterFactories =
- new HashMap<TomcatClusterConfig, TomcatClusterDistributedCacheManagerFactory>();
/**
* Returns the factory, creating one if necessary by loading
@@ -83,25 +79,6 @@
this.distributedCacheManagerFactory = distributedCacheManagerFactory;
}
- public synchronized TomcatClusterDistributedCacheManagerFactory getTomcatClusterDistributedCacheManagerFactory(TomcatClusterConfig config)
- throws ClusteringNotSupportedException
- {
- TomcatClusterDistributedCacheManagerFactory factory = tomcatClusterFactories.get(config);
- if (factory == null)
- {
- factory = (TomcatClusterDistributedCacheManagerFactory) instantiateFactory();
- tomcatClusterFactories.put(config, factory);
- }
- factory.setTomcatClusterConfig(config);
- return factory;
- }
-
- public synchronized void setTomcatClusterDistributedCacheManagerFactory(TomcatClusterConfig config,
- TomcatClusterDistributedCacheManagerFactory factory)
- {
- tomcatClusterFactories.put(config, factory);
- }
-
/**
* Gets the class name of the factory; either the name of any existing
* factory, a class name injected via this property's setter, or
Deleted: projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/JBossSerializationObjectStreamSource.java
===================================================================
--- projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/JBossSerializationObjectStreamSource.java 2010-07-21 16:58:27 UTC (rev 106993)
+++ projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/JBossSerializationObjectStreamSource.java 2010-07-21 18:00:24 UTC (rev 106994)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.web.tomcat.service.session.distributedcache.spi;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.OutputStream;
-
-import org.jboss.ha.framework.interfaces.ObjectStreamSource;
-import org.jboss.serial.io.JBossObjectInputStreamSharedTree;
-import org.jboss.serial.io.JBossObjectOutputStreamSharedTree;
-
-/**
- * {@link ObjectStreamSource} implementation that provides
- * {@link JBossObjectInputStreamSharedTree} and {@link JBossObjectOutputStreamSharedTree}.
- *
- * @author Brian Stansberry
- */
-public class JBossSerializationObjectStreamSource implements ObjectStreamSource
-{
-
- public ObjectInput getObjectInput(InputStream input) throws IOException
- {
- return new JBossObjectInputStreamSharedTree(input);
- }
-
- public ObjectOutput getObjectOutput(OutputStream output) throws IOException
- {
- return new JBossObjectOutputStreamSharedTree(output);
- }
-
-}
Deleted: projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/SessionSerializationFactory.java
===================================================================
--- projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/SessionSerializationFactory.java 2010-07-21 16:58:27 UTC (rev 106993)
+++ projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/SessionSerializationFactory.java 2010-07-21 18:00:24 UTC (rev 106994)
@@ -1,87 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.web.tomcat.service.session.distributedcache.spi;
-
-import java.io.Serializable;
-
-import org.jboss.ha.framework.interfaces.ObjectStreamSource;
-import org.jboss.ha.framework.server.MarshalledValueObjectStreamSource;
-import org.jboss.ha.framework.server.SimpleCachableMarshalledValue;
-import org.jboss.logging.Logger;
-
-/**
- * Factory class for creating object output and input streams,
- * switching between JDK Serialization and JBoss Serialization classes.
- * Using MarshalledValue to replace Serializable used inside different
- * web app class loader context. Assuming that the caller classes are already
- * handling the switch between web app class loader context.
- *
- *
- * @author <a href="hmesha at novell.com">Hany Mesha</a>
- * @author Brian Stansberry
- */
-public class SessionSerializationFactory
-{
- /**
- * System property that, if set to <code>true</code>, indicates that
- * JBoss Serialization should be used for session serialization.
- */
- public static final String JBOSS_SERIALIZATION_SYS_PROP = "session.serialization.jboss";
- private static Logger log_ = Logger.getLogger(SessionSerializationFactory.class);
- private static boolean useJBossSerialization = false;
- private static ObjectStreamSource objectStreamSource;
-
- static
- {
- String useJBossSerializationStr = System.getProperty(JBOSS_SERIALIZATION_SYS_PROP, "false");
- useJBossSerialization = Boolean.valueOf(useJBossSerializationStr).booleanValue();
- objectStreamSource = useJBossSerialization ? new JBossSerializationObjectStreamSource()
- : new MarshalledValueObjectStreamSource();
- try
- {
- if (useJBossSerialization)
- {
- log_.debug("Using JBossSerialization for web session replication");
- }
- }
- catch (Throwable ignored)
- {
- // we don't fail a static initializer due to a debug log stmt
- }
- }
-
- public static SimpleCachableMarshalledValue createMarshalledValue(Serializable o)
- {
- return new SimpleCachableMarshalledValue(o, objectStreamSource);
- }
-
- public static ObjectStreamSource getObjectStreamSource()
- {
- return objectStreamSource;
- }
-
- public static boolean useJBossSerialization()
- {
- return useJBossSerialization;
- }
-
-}
Deleted: projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterConfig.java
===================================================================
--- projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterConfig.java 2010-07-21 16:58:27 UTC (rev 106993)
+++ projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterConfig.java 2010-07-21 18:00:24 UTC (rev 106994)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.web.tomcat.service.session.distributedcache.spi;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-
-import javax.management.MBeanServer;
-
-/**
- * Metadata about the environment of a TomcatClusterDistributedCacheManagerFactory.
- *
- * @author Brian Stansberry
- */
-public interface TomcatClusterConfig
-{
- MBeanServer getMBeanServer();
- String getCacheObjectName();
- File getCacheConfigFile() throws FileNotFoundException;
- String getClusterName();
-}
Deleted: projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterDistributedCacheManagerFactory.java
===================================================================
--- projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterDistributedCacheManagerFactory.java 2010-07-21 16:58:27 UTC (rev 106993)
+++ projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterDistributedCacheManagerFactory.java 2010-07-21 18:00:24 UTC (rev 106994)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.web.tomcat.service.session.distributedcache.spi;
-
-/**
- * @author Brian Stansberry
- *
- */
-public interface TomcatClusterDistributedCacheManagerFactory extends DistributedCacheManagerFactory
-{
- TomcatClusterConfig getTomcatClusterConfig();
-
- void setTomcatClusterConfig(TomcatClusterConfig clusterConfig);
-
- void start() throws Exception;
-
- void stop() throws Exception;
-}
More information about the jboss-cvs-commits
mailing list