[jboss-cvs] JBossAS SVN: r96652 - in trunk: testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 20 14:46:07 EST 2009
Author: bstansberry at jboss.com
Date: 2009-11-20 14:46:06 -0500 (Fri, 20 Nov 2009)
New Revision: 96652
Modified:
trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/DeployerConfig.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java
trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
Log:
[JBAS-7473] Get rid of now-unnecessary "managerClass" configuration
Modified: trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2009-11-20 19:45:28 UTC (rev 96651)
+++ trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2009-11-20 19:46:06 UTC (rev 96652)
@@ -197,12 +197,6 @@
<!--Flag to delete the Work Dir on Context Destroy -->
<property name="deleteWorkDirOnContextDestroy">false</property>
- <!--
- Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
- - org.jboss.web.tomcat.service.session.JBossCacheManager
- -->
- <property name="managerClass">org.jboss.web.tomcat.service.session.JBossCacheManager</property>
-
<!-- The class used as the deployment wrapper -->
<property name="deploymentClass">org.jboss.web.tomcat.service.deployers.TomcatDeployment</property>
@@ -214,11 +208,6 @@
<property name="subjectAttributeName">j_subject</property>
-->
- <!-- The SessionIdAlphabet is the set of characters used to create a session Id
- It must be made up of exactly 65 unique characters
- <property name="sessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-*</property>
- -->
-
<property name="domain">jboss.web</property>
<property name="securityManagerService">
<inject bean="jboss.security:service=JaasSecurityManager" />
Modified: trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2009-11-20 19:45:28 UTC (rev 96651)
+++ trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2009-11-20 19:46:06 UTC (rev 96652)
@@ -138,12 +138,6 @@
<!--Flag to delete the Work Dir on Context Destroy -->
<property name="deleteWorkDirOnContextDestroy">false</property>
- <!--
- Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
- - org.jboss.web.tomcat.service.session.JBossCacheManager
- -->
- <property name="managerClass">org.jboss.web.tomcat.service.session.JBossCacheManager</property>
-
<!-- The class used as the deployment wrapper -->
<property name="deploymentClass">org.jboss.web.tomcat.service.deployers.TomcatDeployment</property>
@@ -155,11 +149,6 @@
<property name="subjectAttributeName">j_subject</property>
-->
- <!-- The SessionIdAlphabet is the set of characters used to create a session Id
- It must be made up of exactly 65 unique characters
- <property name="sessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-*</property>
- -->
-
<property name="domain">jboss.web</property>
<property name="securityManagerService">
<inject bean="jboss.security:service=JaasSecurityManager" />
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/DeployerConfig.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/DeployerConfig.java 2009-11-20 19:45:28 UTC (rev 96651)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/DeployerConfig.java 2009-11-20 19:46:06 UTC (rev 96652)
@@ -43,12 +43,6 @@
private String catalinaDomain = "Catalina";
/**
- * The fully qualified name of the class that will be used for session
- * management if <tt>distributable</tt> is set to true.
- */
- 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";
@@ -137,16 +131,6 @@
this.serviceClassLoader = serviceClassLoader;
}
- public String getManagerClass()
- {
- return managerClass;
- }
-
- public void setManagerClass(String managerClass)
- {
- this.managerClass = managerClass;
- }
-
public String getCacheName()
{
return cacheName;
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2009-11-20 19:45:28 UTC (rev 96651)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2009-11-20 19:46:06 UTC (rev 96652)
@@ -164,48 +164,34 @@
return NAME;
}
- public String getManagerClass()
- {
- return managerClass;
- }
-
- public void setManagerClass(String managerClass)
- {
- this.managerClass = managerClass;
- }
-
/**
- * Gets whether the session <code>Manager</code> implementation for
- * distributable webapps should be overridden with an instance of
- * {@link #getManagerClass()}.
- * <p>
- * Setting this to <code>false</code> allows custom configuration of
- * a manager via a <code>context.xml</code>. Default is <code>true</code>.
- * </p>
+ * Deprecated; always returns <code>false</code>.
*
- * @return <code>true</code> if the manager should be overridden,
- * <code>false</code> if the existing manager should be retained.
+ * @return <code>false</code>
+ *
+ * @deprecated Will be removed in AS 7
*/
+ @Deprecated
public boolean getOverrideDistributableManager()
{
- return this.overrideDistributableManager;
+ return false;
}
/**
- * Sets whether the session <code>Manager</code> implementation for
- * distributable webapps should be overridden with an instance of
- * {@link #getManagerClass()}.
- * <p>
- * Setting this to <code>false</code> allows custom configuration of
- * a manager via a <code>context.xml</code>. Default is <code>true</code>.
- * </p>
+ * Deprecated
*
- * @param override <code>true</code> if the manager should be overridden,
- * <code>false</code> if the existing manager should be retained.
+ * @param override is ignored, except a deprecation message is logged
+ * if <code>true</code>
+ *
+ * @deprecated Will be removed in AS 7
*/
+ @Deprecated
public void setOverrideDistributableManager(boolean override)
{
- this.overrideDistributableManager = override;
+ if (override)
+ {
+ log.info("Property overrideDistributableManager is deprecated, ignoring setter invocation");
+ }
}
public ClassLoader getServiceClassLoader()
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java 2009-11-20 19:45:28 UTC (rev 96651)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java 2009-11-20 19:46:06 UTC (rev 96652)
@@ -64,10 +64,6 @@
*/
public String getSessionIdAlphabet();
- public String getManagerClass();
-
- public void setManagerClass(String managerClass);
-
/** */
public String getContextMBeanCode();
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java 2009-11-20 19:45:28 UTC (rev 96651)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java 2009-11-20 19:46:06 UTC (rev 96652)
@@ -506,11 +506,6 @@
return tomcatDeployer == null ? null : tomcatDeployer.getDomain();
}
- public String getManagerClass()
- {
- return tomcatDeployer == null ? null : tomcatDeployer.getManagerClass();
- }
-
public String getSessionIdAlphabet()
{
return tomcatDeployer == null ? null : tomcatDeployer.getSessionIdAlphabet();
@@ -561,12 +556,6 @@
tomcatDeployer.setDomain(domainName);
}
- public void setManagerClass(String managerClass)
- {
- if (tomcatDeployer != null)
- tomcatDeployer.setManagerClass(managerClass);
- }
-
public void setSecurityManagerService(JaasSecurityManagerServiceMBean mgr)
{
if (tomcatDeployer != null)
Modified: trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-jboss-beans.xml 2009-11-20 19:45:28 UTC (rev 96651)
+++ trunk/tomcat/src/resources/war-deployers-jboss-beans.xml 2009-11-20 19:46:06 UTC (rev 96652)
@@ -208,12 +208,6 @@
<!--Flag to delete the Work Dir on Context Destroy -->
<property name="deleteWorkDirOnContextDestroy">true</property>
- <!--
- Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
- - org.jboss.web.tomcat.service.session.JBossCacheManager
- -->
- <property name="managerClass">org.jboss.web.tomcat.service.session.JBossCacheManager</property>
-
<!-- The name of the request property under with the authenticated JAAS
Subject is stored on successful authentication. If null or empty then
the Subject will not be stored.
More information about the jboss-cvs-commits
mailing list