[jboss-cvs] JBossAS SVN: r65350 - in trunk/tomcat/src/main/org/jboss/web/tomcat/service: session and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 12 23:21:37 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-09-12 23:21:37 -0400 (Wed, 12 Sep 2007)
New Revision: 65350
Modified:
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/DeployerConfig.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/AbstractJBossManager.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java
Log:
[JBAS-4708] Move default clustering config info out of DeployerConfig to WebMetaData
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/DeployerConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/DeployerConfig.java 2007-09-13 03:20:28 UTC (rev 65349)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/DeployerConfig.java 2007-09-13 03:21:37 UTC (rev 65350)
@@ -52,11 +52,6 @@
private String managerClass = "org.jboss.web.tomcat.service.session.JBossManager";
/**
- * JMX Object name of the TreeCache MBean. Used by JBossCacheManager
- */
- private String cacheName = "jboss.cache:service=TreeCache";
-
- /**
* The web context class to create
*/
private String contextClassName;
@@ -90,29 +85,8 @@
* delete when the war is undeployed.
*/
private boolean deleteWorkDirs = true;
- /**
- * Which snapshot mode should be used in clustered environment?
- * Default: instant
- */
- private String snapshotMode = "instant"; // instant or interval
- /**
- * With IntervalSnapshotManager use this interval (in ms) for snapshotting
- */
- private int snapshotInterval = 1000;
/**
- * Should the clustering code use caching or not?
- */
- private boolean useLocalCache;
-
- /**
- * Whether to use MOD_JK(2) for sticky session combined with JvmRoute. If set to true,
- * it will insert a JvmRouteFilter to intercept every request and replace the JvmRoute
- * if it detects a failover.
- */
- private boolean useJK = false;
-
- /**
* Get the request attribute name under which the JAAS Subject is store
*/
private String subjectAttributeName = null;
@@ -157,16 +131,6 @@
this.managerClass = managerClass;
}
- public String getCacheName()
- {
- return cacheName;
- }
-
- public void setCacheName(String cacheName)
- {
- this.cacheName = cacheName;
- }
-
public String getCatalinaDomain()
{
return catalinaDomain;
@@ -257,46 +221,6 @@
this.deleteWorkDirs = deleteWorkDirs;
}
- public String getSnapshotMode()
- {
- return snapshotMode;
- }
-
- public void setSnapshotMode(String snapshotMode)
- {
- this.snapshotMode = snapshotMode;
- }
-
- public int getSnapshotInterval()
- {
- return snapshotInterval;
- }
-
- public void setSnapshotInterval(int snapshotInterval)
- {
- this.snapshotInterval = snapshotInterval;
- }
-
- 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 String getSubjectAttributeName()
{
return subjectAttributeName;
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-09-13 03:20:28 UTC (rev 65349)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2007-09-13 03:21:37 UTC (rev 65350)
@@ -44,6 +44,7 @@
import org.apache.tomcat.util.modeler.Registry;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.WebMetaData;
+import org.jboss.metadata.web.ReplicationConfig;
import org.jboss.metadata.web.WebMetaDataObjectFactory;
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
@@ -732,10 +733,6 @@
config.setCatalinaDomain(catalinaDomain);
config.setContextClassName(contextClassName);
config.setServiceName(null);
- config.setSnapshotInterval(this.snapshotInterval);
- config.setSnapshotMode(this.snapshotMode);
- config.setUseLocalCache(this.useLocalCache);
- config.setUseJK(this.useJK);
config.setSubjectAttributeName(this.subjectAttributeName);
config.setUseJBossWebLoader(this.useJBossWebLoader);
config.setAllowSelfPrivilegedWebApps(this.allowSelfPrivilegedWebApps);
@@ -743,6 +740,16 @@
config.setFilteredPackages(filteredPackages);
config.setSharedMetaData(sharedMetaData);
+ // Inject our defaults into the WebMetaData
+ if (metaData.getDistributable())
+ {
+ ReplicationConfig repCfg = metaData.getReplicationConfig();
+ repCfg.setDefaultCacheName(this.cacheName);
+ repCfg.setDefaultUseJK(this.useJK);
+ repCfg.setDefaultSnapshotMode(this.snapshotMode);
+ repCfg.setDefaultSnapshotInterval(this.snapshotInterval);
+ repCfg.setDefaultUseLocalCache(this.useLocalCache);
+ }
//Check if there are any xacml policy files
VirtualFile vf = unit.getMetaDataFile("jboss-xacml-policy.xml");
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2007-09-13 03:20:28 UTC (rev 65349)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2007-09-13 03:21:37 UTC (rev 65350)
@@ -323,17 +323,8 @@
Class managerClass = Thread.currentThread().getContextClassLoader().loadClass(managerClassName);
manager = (AbstractJBossManager)managerClass.newInstance();
String name = "//" + ((hostName == null) ? "localhost" : hostName) + ctxPath;
- manager.init(name, metaData, config.isUseJK(), config.isUseLocalCache());
+ manager.init(name, metaData);
- if (manager instanceof JBossCacheManager)
- {
- String snapshotMode = config.getSnapshotMode();
- int snapshotInterval = config.getSnapshotInterval();
- JBossCacheManager jbcm = (JBossCacheManager)manager;
- jbcm.setSnapshotMode(snapshotMode);
- jbcm.setSnapshotInterval(snapshotInterval);
- }
-
server.setAttribute(objectName, new Attribute("manager", manager));
log.debug("Enabled clustering support for ctxPath=" + ctxPath);
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/AbstractJBossManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/AbstractJBossManager.java 2007-09-13 03:20:28 UTC (rev 65349)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/AbstractJBossManager.java 2007-09-13 03:21:37 UTC (rev 65350)
@@ -37,12 +37,9 @@
/** Initialize the manager with the web metadata and
* @param name
* @param webMetaData
- * @param useJK
- * @param useLocalCache
* @throws ClusteringNotSupportedException
*/
- public void init(String name, WebMetaData webMetaData, boolean useJK,
- boolean useLocalCache)
+ public void init(String name, WebMetaData webMetaData)
throws ClusteringNotSupportedException;
/** The session invalidation policy.
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java 2007-09-13 03:20:28 UTC (rev 65349)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java 2007-09-13 03:21:37 UTC (rev 65350)
@@ -47,6 +47,7 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.metadata.WebMetaData;
+import org.jboss.metadata.web.ReplicationConfig;
import org.jboss.mx.util.MBeanServerLocator;
/**
@@ -154,15 +155,23 @@
* running unembedded.
* </p>
*/
- public void init(String name, WebMetaData webMetaData,
- boolean useJK, boolean useLocalCache)
+ public void init(String name, WebMetaData webMetaData)
throws ClusteringNotSupportedException
{
- super.init(name, webMetaData, useJK, useLocalCache);
- this.useJK_ = useJK;
- this.replicationFieldBatchMode_ =
- webMetaData.getReplicationFieldBatchMode() ? Boolean.TRUE : Boolean.FALSE;
+ super.init(name, webMetaData);
+ ReplicationConfig repCfg = webMetaData.getReplicationConfig();
+ this.useJK_ = Boolean.parseBoolean(repCfg.getUseJK());
+ String batch = repCfg.getFieldBatchMode();
+ this.replicationFieldBatchMode_ =
+ (batch == null || Boolean.parseBoolean(batch))
+ ? Boolean.TRUE : Boolean.FALSE;
+ setSnapshotMode(repCfg.getSnapshotMode());
+ if (repCfg.getSnapshotInterval() != null)
+ {
+ setSnapshotInterval(Integer.parseInt(repCfg.getSnapshotInterval()));
+ }
+
PojoCache pc = getPojoCache();
if (pc == null)
{
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java 2007-09-13 03:20:28 UTC (rev 65349)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java 2007-09-13 03:21:37 UTC (rev 65350)
@@ -193,7 +193,7 @@
}
- public void init(String name, WebMetaData webMetaData, boolean useJK, boolean useLocalCache)
+ public void init(String name, WebMetaData webMetaData)
throws ClusteringNotSupportedException
{
ReplicationConfig rpc = webMetaData.getReplicationConfig();
@@ -201,6 +201,8 @@
{
replicationGranularity_ = ReplicationGranularity.fromString(rpc.getGranularity());
invalidateSessionPolicy_ = InvalidateSessionPolicy.fromString(rpc.getTrigger());
+ String useLocal = rpc.getUseLocalCache();
+ useLocalCache_ = (useLocal == null || Boolean.parseBoolean(useLocal));
}
maxActive_ = webMetaData.getMaxActiveSessionsAllowed();
PassivationConfig pConfig = webMetaData.getPassivationConfig();
@@ -214,7 +216,6 @@
}
}
- useLocalCache_ = useLocalCache;
log_.debug("init(): replicationGranularity_ is " + replicationGranularity_ +
" and invalidateSessionPolicy is " + invalidateSessionPolicy_ +
" and maxActiveSessions allowed is " + maxActive_ +
More information about the jboss-cvs-commits
mailing list