[jboss-cvs] JBossAS SVN: r95929 - in trunk/tomcat/src: resources and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 2 13:12:50 EST 2009
Author: remy.maucherat at jboss.com
Date: 2009-11-02 13:12:50 -0500 (Mon, 02 Nov 2009)
New Revision: 95929
Modified:
trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/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/TomcatDeployment.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java
trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
Log:
- Switch work dir removal vack to true, it is a better default for AS.
- Drop unused Tomcat classloader configuration.
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/DeployerConfig.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/DeployerConfig.java 2009-11-02 17:31:18 UTC (rev 95928)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/DeployerConfig.java 2009-11-02 18:12:50 UTC (rev 95929)
@@ -80,16 +80,6 @@
private ObjectName serviceName;
/**
- * The catalina debug level
- */
- private int debugLevel;
-
- /**
- * A flag indicating if the JBoss UCL should be used
- */
- private boolean useJBossWebLoader = true;
-
- /**
* A flag indicating if the working dir for a war deployment should be delete when the war is undeployed.
*/
private boolean deleteWorkDirs = true;
@@ -104,9 +94,6 @@
*/
private String defaultSecurityDomain;
- /** Package names that should be ignored for class loading */
- private String[] filteredPackages;
-
/**
* Shared WebMetaData.
*/
@@ -210,26 +197,6 @@
this.serviceName = serviceName;
}
- public int getDebugLevel()
- {
- return debugLevel;
- }
-
- public void setDebugLevel(int debugLevel)
- {
- this.debugLevel = debugLevel;
- }
-
- public boolean isUseJBossWebLoader()
- {
- return useJBossWebLoader;
- }
-
- public void setUseJBossWebLoader(boolean useJBossWebLoader)
- {
- this.useJBossWebLoader = useJBossWebLoader;
- }
-
public boolean isDeleteWorkDirs()
{
return deleteWorkDirs;
@@ -302,16 +269,6 @@
this.securityContextClassName = securityContextClassName;
}
- public String[] getFilteredPackages()
- {
- return filteredPackages;
- }
-
- public void setFilteredPackages(String[] filteredPackages)
- {
- this.filteredPackages = filteredPackages;
- }
-
public JBossWebMetaData getSharedMetaData()
{
return sharedMetaData;
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-02 17:31:18 UTC (rev 95928)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2009-11-02 18:12:50 UTC (rev 95929)
@@ -100,17 +100,9 @@
/** Whether to override the Manager impl for distributable webapps */
private boolean overrideDistributableManager = true;
- /**
- * A flag indicating if the JBoss Loader should be used
- */
- private boolean useJBossWebLoader = true;
+ private boolean deleteWorkDirOnContextDestroy = true;
/**
- * JBAS-3358: Work directory shouldn't be deleted on Context Destroy
- */
- private boolean deleteWorkDirOnContextDestroy = false;
-
- /**
* JBAS-2283: Provide custom header based auth support
*/
private String httpHeaderForSSOAuth = null;
@@ -157,9 +149,6 @@
/** FQN of the SecurityContext Class */
private String securityContextClassName;
- /** */
- private String[] filteredPackages;
-
private boolean runtimeLifecycleCoupled = false;
private String policyRegistrationName;
@@ -322,16 +311,6 @@
return SessionIDGenerator.getInstance().getSessionIdAlphabet();
}
- public boolean getUseJBossWebLoader()
- {
- return useJBossWebLoader;
- }
-
- public void setUseJBossWebLoader(boolean flag)
- {
- this.useJBossWebLoader = flag;
- }
-
public String getConfigFile()
{
return serverConfigFile;
@@ -384,16 +363,6 @@
this.securityContextClassName = securityContextClassName;
}
- public String[] getFilteredPackages()
- {
- return filteredPackages;
- }
-
- public void setFilteredPackages(String[] pkgs)
- {
- this.filteredPackages = pkgs;
- }
-
public String getDeploymentClass()
{
return deploymentClass;
@@ -519,10 +488,8 @@
config.setContextClassName(contextClassName);
config.setServiceName(null);
config.setSubjectAttributeName(this.subjectAttributeName);
- config.setUseJBossWebLoader(this.useJBossWebLoader);
config.setAllowSelfPrivilegedWebApps(this.allowSelfPrivilegedWebApps);
config.setSecurityManagerService(this.secMgrService);
- config.setFilteredPackages(filteredPackages);
config.setSharedMetaData(sharedMetaData);
config.setSharedTldMetaData(sharedTldMetaData);
config.setDeleteWorkDirs(deleteWorkDirOnContextDestroy);
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-02 17:31:18 UTC (rev 95928)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java 2009-11-02 18:12:50 UTC (rev 95929)
@@ -62,16 +62,6 @@
*/
public String getSessionIdAlphabet();
- /**
- * Get the JBoss UCL use flag
- */
- public boolean getUseJBossWebLoader();
-
- /**
- * Set the JBoss UCL use flag
- */
- public void setUseJBossWebLoader(boolean flag);
-
public String getManagerClass();
public void setManagerClass(String managerClass);
@@ -128,18 +118,6 @@
public void setSecurityManagerService(JaasSecurityManagerServiceMBean mgr);
/**
- *
- * @return
- */
- public String[] getFilteredPackages();
-
- /**
- *
- * @param pkgs
- */
- public void setFilteredPackages(String[] pkgs);
-
- /**
* <p>
* Obtain the value of the {@code httpHeaderForSSOAuth} property. This property is used to indicate what request
* header ids will be used to retrieve the SSO identity set by a third party security system.
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2009-11-02 17:31:18 UTC (rev 95928)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2009-11-02 18:12:50 UTC (rev 95929)
@@ -97,7 +97,7 @@
private final String serverName = "jboss";
- private final HashMap vhostToHostNames = new HashMap();
+ private final HashMap<String, String> vhostToHostNames = new HashMap<String, String>();
private ORB orb = null;
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-02 17:31:18 UTC (rev 95928)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java 2009-11-02 18:12:50 UTC (rev 95929)
@@ -501,21 +501,11 @@
return tomcatDeployer == null ? null : tomcatDeployer.getContextMBeanCode();
}
- public boolean getUseJBossWebLoader()
- {
- return tomcatDeployer == null ? false : tomcatDeployer.getUseJBossWebLoader();
- }
-
public String getDomain()
{
return tomcatDeployer == null ? null : tomcatDeployer.getDomain();
}
- public String[] getFilteredPackages()
- {
- return tomcatDeployer == null ? null : tomcatDeployer.getFilteredPackages();
- }
-
public String getManagerClass()
{
return tomcatDeployer == null ? null : tomcatDeployer.getManagerClass();
@@ -571,12 +561,6 @@
tomcatDeployer.setDomain(domainName);
}
- public void setFilteredPackages(String[] pkgs)
- {
- if (tomcatDeployer != null)
- tomcatDeployer.setFilteredPackages(pkgs);
- }
-
public void setManagerClass(String managerClass)
{
if (tomcatDeployer != null)
@@ -601,12 +585,6 @@
tomcatDeployer.setSubjectAttributeName(name);
}
- public void setUseJBossWebLoader(boolean flag)
- {
- if (tomcatDeployer != null)
- tomcatDeployer.setUseJBossWebLoader(flag);
- }
-
public void startConnectors() throws Exception
{
if (tomcatDeployer == null)
Modified: trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-jboss-beans.xml 2009-11-02 17:31:18 UTC (rev 95928)
+++ trunk/tomcat/src/resources/war-deployers-jboss-beans.xml 2009-11-02 18:12:50 UTC (rev 95929)
@@ -33,7 +33,7 @@
<bean name="ServletContainerInitializerDeployer" class="org.jboss.deployment.ServletContainerInitializerDeployer">
<property name="relativeOrder">2004</property>
</bean>
- <!-- Temporary for Servlet 3.0 annotation support, large performance drop ... -->
+ <!-- Servlet 3.0 annotation support (performance drop) -->
<bean name="WebAnnotationMetaDataDeployer" class="org.jboss.web.deployers.WarAnnotationMetaDataDeployer">
<property name="relativeOrder">2005</property>
<property name="metaDataCompleteIsDefault">false</property>
@@ -151,16 +151,15 @@
<property name="mainDeployer"><inject bean="MainDeployer" /></property>
<property name="relativeOrder">3000</property>
-
- <!-- FIXME Get this moved to TomcatService in deploy -->
+
<property name="configFile">
<value-factory bean="ServiceBindingManager" method="getResourceBinding">
<parameter>jboss.web:service=WebServer</parameter>
<parameter>${jboss.server.home.url}${/}deploy${/}jbossweb.sar${/}server.xml</parameter>
</value-factory>
</property>
-
- <!-- JARs containing TLDs -->
+
+ <!-- JARs containing TLDs -->
<property name="tldJars">jstl.jar, jsf-libs/jsf-impl.jar</property>
<!-- You can configure a set of authenticators keyed by http-auth method
@@ -204,27 +203,11 @@
model.
-->
<property name="java2ClassLoadingCompliance">false</property>
- <!-- A flag indicating if the JBoss Loader should be used. This loader
- uses a unified class loader as the class loader rather than the tomcat
- specific class loader.
- The default is false to ensure that wars have isolated class loading
- for duplicate jars and jsp files.
- -->
- <property name="useJBossWebLoader">false</property>
- <!-- The list of package prefixes that should not be loaded without
- delegating to the parent class loader before trying the web app
- class loader. The packages listed here are those tha are used by
- the web container implementation and cannot be overriden. The format
- is a comma separated list of the package names. There cannot be any
- whitespace between the package prefixes.
- This setting only applies when UseJBossWebLoader=false.
- -->
- <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property>
<property name="lenientEjbLink">true</property>
<!--Flag to delete the Work Dir on Context Destroy -->
- <property name="deleteWorkDirOnContextDestroy">false</property>
+ <property name="deleteWorkDirOnContextDestroy">true</property>
<!--
Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
More information about the jboss-cvs-commits
mailing list