Author: remy.maucherat(a)jboss.com Date: 2007-09-05 11:06:01 -0400 (Wed, 05 Sep 2007) New Revision: 266 Added: trunk/jboss/org/ trunk/jboss/org/apache/ trunk/jboss/org/apache/catalina/ trunk/jboss/org/apache/catalina/startup/ trunk/jboss/org/apache/catalina/startup/catalina.properties Removed: trunk/jboss/catalina.properties Modified: trunk/build.xml Log: - Replace catalina.properties in jbossweb.jar with the JBoss specific configuration. Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2007-09-05 14:51:59 UTC (rev 265) +++ trunk/build.xml 2007-09-05 15:06:01 UTC (rev 266) @@ -489,6 +489,7 @@ <fileset dir="${tomcat.classes}"> <include name="org/apache/*" /> <include name="org/apache/catalina/**" /> + <exclude name="org/apache/catalina/startup/catalina.properties" /> <include name="org/apache/naming/**" /> <include name="org/apache/coyote/**" /> <include name="org/apache/tomcat/jni/**" /> @@ -499,6 +500,9 @@ <!-- Javadoc and i18n exclusions --> <exclude name="**/package.html" /> </fileset> + <fileset dir="${basedir}/jboss"> + <include name="org/apache/catalina/startup/catalina.properties" /> + </fileset> </jar> <copy file="${jasper-jdt.jar}" todir="${tomcat.jars}" /> Deleted: trunk/jboss/catalina.properties =================================================================== --- trunk/jboss/catalina.properties 2007-09-05 14:51:59 UTC (rev 265) +++ trunk/jboss/catalina.properties 2007-09-05 15:06:01 UTC (rev 266) @@ -1,71 +0,0 @@ -# -# List of comma-separated packages that start with or equal this string -# will cause a security exception to be thrown when -# passed to checkPackageAccess unless the -# corresponding RuntimePermission ("accessClassInPackage."+package) has -# been granted. -package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans. -# -# List of comma-separated packages that start with or equal this string -# will cause a security exception to be thrown when -# passed to checkPackageDefinition unless the -# corresponding RuntimePermission ("defineClassInPackage."+package) has -# been granted. -# -# by default, no packages are restricted for definition, and none of -# the class loaders supplied with the JDK call checkPackageDefinition. -# -package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper. - -# -# -# List of comma-separated paths defining the contents of the "common" -# classloader. Prefixes should be used to define what is the repository type. -# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. -# If left as blank,the JVM system loader will be used as Catalina's "common" -# loader. -# Examples: -# "foo": Add this folder as a class repository -# "foo/*.jar": Add all the JARs of the specified folder as class -# repositories -# "foo/bar.jar": Add bar.jar as a class repository -common.loader=${catalina.home}/lib,${catalina.home}/lib/*.jar - -# -# List of comma-separated paths defining the contents of the "server" -# classloader. Prefixes should be used to define what is the repository type. -# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. -# If left as blank, the "common" loader will be used as Catalina's "server" -# loader. -# Examples: -# "foo": Add this folder as a class repository -# "foo/*.jar": Add all the JARs of the specified folder as class -# repositories -# "foo/bar.jar": Add bar.jar as a class repository -server.loader= - -# -# List of comma-separated paths defining the contents of the "shared" -# classloader. Prefixes should be used to define what is the repository type. -# Path may be relative to the CATALINA_BASE path or absolute. If left as blank, -# the "common" loader will be used as Catalina's "shared" loader. -# Examples: -# "foo": Add this folder as a class repository -# "foo/*.jar": Add all the JARs of the specified folder as class -# repositories -# "foo/bar.jar": Add bar.jar as a class repository -# Please note that for single jars, e.g. bar.jar, you need the URL form -# starting with file:. -shared.loader= - -# -# String cache configuration. -tomcat.util.buf.StringCache.byte.enabled=true -#tomcat.util.buf.StringCache.char.enabled=true -#tomcat.util.buf.StringCache.trainThreshold=500000 -#tomcat.util.buf.StringCache.cacheSize=5000 - -# JBoss AS configuration -org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true -org.apache.catalina.core.StandardService.DELAY_CONNECTOR_STARTUP=true - Copied: trunk/jboss/org/apache/catalina/startup/catalina.properties (from rev 265, trunk/jboss/catalina.properties) =================================================================== --- trunk/jboss/org/apache/catalina/startup/catalina.properties (rev 0) +++ trunk/jboss/org/apache/catalina/startup/catalina.properties 2007-09-05 15:06:01 UTC (rev 266) @@ -0,0 +1,71 @@ +# +# List of comma-separated packages that start with or equal this string +# will cause a security exception to be thrown when +# passed to checkPackageAccess unless the +# corresponding RuntimePermission ("accessClassInPackage."+package) has +# been granted. +package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans. +# +# List of comma-separated packages that start with or equal this string +# will cause a security exception to be thrown when +# passed to checkPackageDefinition unless the +# corresponding RuntimePermission ("defineClassInPackage."+package) has +# been granted. +# +# by default, no packages are restricted for definition, and none of +# the class loaders supplied with the JDK call checkPackageDefinition. +# +package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper. + +# +# +# List of comma-separated paths defining the contents of the "common" +# classloader. Prefixes should be used to define what is the repository type. +# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. +# If left as blank,the JVM system loader will be used as Catalina's "common" +# loader. +# Examples: +# "foo": Add this folder as a class repository +# "foo/*.jar": Add all the JARs of the specified folder as class +# repositories +# "foo/bar.jar": Add bar.jar as a class repository +common.loader=${catalina.home}/lib,${catalina.home}/lib/*.jar + +# +# List of comma-separated paths defining the contents of the "server" +# classloader. Prefixes should be used to define what is the repository type. +# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. +# If left as blank, the "common" loader will be used as Catalina's "server" +# loader. +# Examples: +# "foo": Add this folder as a class repository +# "foo/*.jar": Add all the JARs of the specified folder as class +# repositories +# "foo/bar.jar": Add bar.jar as a class repository +server.loader= + +# +# List of comma-separated paths defining the contents of the "shared" +# classloader. Prefixes should be used to define what is the repository type. +# Path may be relative to the CATALINA_BASE path or absolute. If left as blank, +# the "common" loader will be used as Catalina's "shared" loader. +# Examples: +# "foo": Add this folder as a class repository +# "foo/*.jar": Add all the JARs of the specified folder as class +# repositories +# "foo/bar.jar": Add bar.jar as a class repository +# Please note that for single jars, e.g. bar.jar, you need the URL form +# starting with file:. +shared.loader= + +# +# String cache configuration. +tomcat.util.buf.StringCache.byte.enabled=true +#tomcat.util.buf.StringCache.char.enabled=true +#tomcat.util.buf.StringCache.trainThreshold=500000 +#tomcat.util.buf.StringCache.cacheSize=5000 + +# JBoss AS configuration +org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true +org.apache.catalina.core.StandardService.DELAY_CONNECTOR_STARTUP=true +org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true