[jboss-cvs] JBossAS SVN: r106462 - projects/cluster/ha-server-cache-spi/branches/Session_Ownership/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jul 6 14:38:32 EDT 2010


Author: bstansberry at jboss.com
Date: 2010-07-06 14:38:32 -0400 (Tue, 06 Jul 2010)
New Revision: 106462

Removed:
   projects/cluster/ha-server-cache-spi/branches/Session_Ownership/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterConfig.java
   projects/cluster/ha-server-cache-spi/branches/Session_Ownership/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterDistributedCacheManagerFactory.java
Modified:
   projects/cluster/ha-server-cache-spi/branches/Session_Ownership/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/DistributedCacheManagerFactoryFactory.java
Log:
[JBCLUSTER-283] Remove standalone tomcat support

Modified: projects/cluster/ha-server-cache-spi/branches/Session_Ownership/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/DistributedCacheManagerFactoryFactory.java
===================================================================
--- projects/cluster/ha-server-cache-spi/branches/Session_Ownership/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/DistributedCacheManagerFactoryFactory.java	2010-07-06 18:36:17 UTC (rev 106461)
+++ projects/cluster/ha-server-cache-spi/branches/Session_Ownership/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/DistributedCacheManagerFactoryFactory.java	2010-07-06 18:38:32 UTC (rev 106462)
@@ -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/branches/Session_Ownership/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterConfig.java
===================================================================
--- projects/cluster/ha-server-cache-spi/branches/Session_Ownership/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterConfig.java	2010-07-06 18:36:17 UTC (rev 106461)
+++ projects/cluster/ha-server-cache-spi/branches/Session_Ownership/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterConfig.java	2010-07-06 18:38:32 UTC (rev 106462)
@@ -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/branches/Session_Ownership/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterDistributedCacheManagerFactory.java
===================================================================
--- projects/cluster/ha-server-cache-spi/branches/Session_Ownership/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterDistributedCacheManagerFactory.java	2010-07-06 18:36:17 UTC (rev 106461)
+++ projects/cluster/ha-server-cache-spi/branches/Session_Ownership/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TomcatClusterDistributedCacheManagerFactory.java	2010-07-06 18:38:32 UTC (rev 106462)
@@ -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