[jboss-cvs] JBossAS SVN: r66987 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 12 16:44:08 EST 2007
Author: bstansberry at jboss.com
Date: 2007-11-12 16:44:08 -0500 (Mon, 12 Nov 2007)
New Revision: 66987
Modified:
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java
Log:
[JBAS-4967] Extract setting of default clustering JBossWebMetaData from TomcatDeployer
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2007-11-12 21:42:39 UTC (rev 66986)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2007-11-12 21:44:08 UTC (rev 66987)
@@ -84,13 +84,6 @@
// Constants -----------------------------------------------------
public static final String NAME = "TomcatDeployer";
- /**
- * Default value for property <code>cacheName</code>. This name will be used by JBossCache exclusively
- * for Tomcat clustering, e.g., session and sso replication.
- */
- public static final String DEFAULT_CACHE_NAME =
- "jboss.cache:service=TomcatClusteringCache";
-
/** The web app context implementation class */
private String contextClassName =
"org.apache.catalina.core.StandardContext";
@@ -113,40 +106,12 @@
private String catalinaDomain = "Catalina";
/**
- * ObjectName of a shared TreeCache used for clustered session replication
- * and clustered single-sign-on
- */
- private String cacheName = DEFAULT_CACHE_NAME;
-
- /**
* The fully qualified name of the class that will be used for session
* management if <tt>distributable</tt> is set to true.
*/
protected String managerClass = "org.jboss.web.tomcat.service.session.JBossCacheManager";
/**
- * With IntervalSnapshotManager use this interval (in ms)
- * for snapshotting
- */
- private int snapshotInterval = 1000;
-
- /**
- * Which snapshot mode should be used in clustered environment?
- * Default: instant
- */
- private String snapshotMode = "instant"; // instant or interval
-
- /**
- * Should the clustering code use a local cache for the sessions?
- */
- private boolean useLocalCache = true;
-
- /**
- * Whether we are using Apache MOD_JK(2) module or not
- */
- private boolean useJK = false;
-
- /**
* A flag indicating if the JBoss Loader should be used
*/
private boolean useJBossWebLoader = true;
@@ -255,84 +220,6 @@
return contextClassName;
}
- /**
- * Set the snapshot interval in milliseconds for snapshot mode = interval
- */
- public void setSnapshotInterval(int interval)
- {
- this.snapshotInterval = interval;
- }
-
- /**
- * Get the snapshot interval
- */
- public int getSnapshotInterval()
- {
- return this.snapshotInterval;
- }
-
- /**
- * Set the snapshot mode. Currently supported: instant or interval
- */
- public void setSnapshotMode(String mode)
- {
- this.snapshotMode = mode;
- }
-
- /**
- * Get the snapshot mode
- */
- public String getSnapshotMode()
- {
- return this.snapshotMode;
- }
-
- /**
- * Gets the JMX object name of a shared TreeCache to be used for clustered
- * single-sign-on.
- *
- * @see #DEFAULT_CACHE_NAME
- * @see org.jboss.web.tomcat.service.sso.TreeCacheSSOClusterManager
- */
- public String getCacheName()
- {
- return cacheName;
- }
-
- /**
- * Gets the JMX object name of a shared TreeCache to be used for clustered
- * single-sign-on.
- * <p/>
- * <b>NOTE:</b> TreeCache must be deployed before this service.
- *
- * @see #DEFAULT_CACHE_NAME
- * @see org.jboss.web.tomcat.service.sso.TreeCacheSSOClusterManager
- */
- public void setCacheName(String cacheName)
- {
- this.cacheName = cacheName;
- }
-
- public boolean isUseLocalCache()
- {
- return useLocalCache;
- }
-
- public void setUseLocalCache(boolean useLocalCache)
- {
- this.useLocalCache = useLocalCache;
- }
-
- public boolean isUseJK()
- {
- return useJK;
- }
-
- public void setUseJK(boolean useJK)
- {
- this.useJK = useJK;
- }
-
public boolean getDeleteWorkDirOnContextDestroy()
{
return deleteWorkDirOnContextDestroy;
@@ -765,18 +652,6 @@
config.setSecurityContextClassName(securityContextClassName);
config.setSecurityManagement(securityManagement);
- // Inject our defaults into the JBossWebMetaData
- if (metaData.getDistributable() != null)
- {
- ReplicationConfig repCfg = metaData.getReplicationConfig();
- repCfg.setCacheName(this.cacheName);
- repCfg.setUseJKBoolean(this.useJK);
- repCfg.setSnapshotMode(this.snapshotMode);
- repCfg.setSnapshotIntervalInteger(this.snapshotInterval);
- // This appears to be not used anymore??? - See JBAS-4960
- //repCfg.setUseLocalCache(this.useLocalCache);
- }
-
//Check if there are any xacml policy files
VirtualFile vf = unit.getMetaDataFile("jboss-xacml-policy.xml");
if(vf != null)
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java 2007-11-12 21:42:39 UTC (rev 66986)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java 2007-11-12 21:44:08 UTC (rev 66987)
@@ -63,46 +63,6 @@
public void setDomain(String domainName);
/**
- * Set the snapshot mode in a clustered environment
- */
- public void setSnapshotMode(String mode);
-
- /**
- * Get the snapshot mode in a clustered environment
- */
- public String getSnapshotMode();
-
- /**
- * Set the snapshot interval in ms for the interval snapshot mode
- */
- public void setSnapshotInterval(int interval);
-
- /**
- * Get the snapshot interval
- */
- public int getSnapshotInterval();
-
- /**
- * Get the clustering code cache behaviour
- */
- public boolean isUseLocalCache();
-
- /**
- * Set the clustering code cache behaviour
- */
- public void setUseLocalCache(boolean useLocalCache);
-
- /**
- * Get the clustering code failover behaviour whether MOD_JK(2) is used or not.
- */
- public boolean isUseJK();
-
- /**
- * Set the clustering code failover behaviour whether MOD_JK(2) is used or not.
- */
- public void setUseJK(boolean useJK);
-
- /**
* The SessionIdAlphabet is the set of characters used to create a session Id
*/
public void setSessionIdAlphabet(String sessionIdAlphabet);
@@ -113,24 +73,6 @@
public String getSessionIdAlphabet();
/**
- * Gets the JMX object name of a shared TreeCache to be used for clustered
- * single-sign-on.
- *
- * @see org.jboss.web.tomcat.service.sso.TreeCacheSSOClusterManager
- */
- public String getCacheName();
-
- /**
- * Gets the JMX object name of a shared TreeCache to be used for clustered
- * single-sign-on.
- * <p/>
- * <b>NOTE:</b> TreeCache must be deployed before this service.
- *
- * @see org.jboss.web.tomcat.service.sso.TreeCacheSSOClusterManager
- */
- public void setCacheName(String cacheName);
-
- /**
* Get the JBoss UCL use flag
*/
public boolean getUseJBossWebLoader();
More information about the jboss-cvs-commits
mailing list