cvs commit: jakarta-tomcat-catalina/catalina/src/conf catalina.properties

2005-07-22 Thread markt 
markt   2005/07/22 11:33:21

  Modified:catalina/src/conf catalina.properties
  Log:
  Fix typo.
  
  Revision  ChangesPath
  1.14  +1 -1  
jakarta-tomcat-catalina/catalina/src/conf/catalina.properties
  
  Index: catalina.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/conf/catalina.properties,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- catalina.properties   21 Jul 2005 19:57:17 -  1.13
  +++ catalina.properties   22 Jul 2005 18:33:21 -  1.14
  @@ -54,7 +54,7 @@
   # 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 foe individual jar files, e.g. bar.jar, you need the URL 
form
  +# Please note that for individual jar files, e.g. bar.jar, you need the URL 
form
   # starting with file:.
   
shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf catalina.properties

2004-10-20 Thread remm 
remm2004/10/20 05:28:58

  Modified:catalina/src/share/org/apache/catalina/startup
catalina.properties
   catalina/src/conf catalina.properties
  Log:
  - Enable the cache for bytes, for some actual testing.
  
  Revision  ChangesPath
  1.7   +7 -0  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/catalina.properties
  
  Index: catalina.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/catalina.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- catalina.properties   8 Sep 2004 12:56:34 -   1.6
  +++ catalina.properties   20 Oct 2004 12:28:57 -  1.7
  @@ -55,3 +55,10 @@
   #  repositories
   # foo/bar.jar: Add bar.jar as a class repository 
   shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
  +
  +#
  +# String cache configuration.
  +tomcat.util.buf.StringCache.byte.enabled=true
  +#tomcat.util.buf.StringCache.char.enabled=true
  +#tomcat.util.buf.StringCache.trainThreshold=50
  +#tomcat.util.buf.StringCache.cacheSize=5000
  
  
  
  1.12  +7 -0  jakarta-tomcat-catalina/catalina/src/conf/catalina.properties
  
  Index: catalina.properties
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/catalina.properties,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- catalina.properties   1 Sep 2004 10:10:48 -   1.11
  +++ catalina.properties   20 Oct 2004 12:28:58 -  1.12
  @@ -55,3 +55,10 @@
   #  repositories
   # foo/bar.jar: Add bar.jar as a class repository 
   shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
  +
  +#
  +# String cache configuration.
  +tomcat.util.buf.StringCache.byte.enabled=true
  +#tomcat.util.buf.StringCache.char.enabled=true
  +#tomcat.util.buf.StringCache.trainThreshold=50
  +#tomcat.util.buf.StringCache.cacheSize=5000
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf catalina.properties

2003-09-26 Thread luehe 
luehe   2003/09/26 12:32:08

  Modified:catalina/src/conf catalina.properties
  Log:
  Reverted patch for JAR exclusion list
  
  Revision  ChangesPath
  1.9   +0 -5  jakarta-tomcat-catalina/catalina/src/conf/catalina.properties
  
  Index: catalina.properties
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/catalina.properties,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- catalina.properties   23 Sep 2003 21:10:28 -  1.8
  +++ catalina.properties   26 Sep 2003 19:32:08 -  1.9
  @@ -53,8 +53,3 @@
   #  repositories
   # foo/bar.jar: Add bar.jar as a class repository 
   shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
  -
  -#
  -# List of comma-separated names of JAR files that are known not to contain
  -# any TLDs
  
-noTldJars=ant.jar,catalina.jar,catalina-ant.jar,catalina-cluster.jar,catalina-optional.jar,catalina-i18n-fr.jar,catalina-i18n-ja.jar,catalina-i18n-es.jar,commons-dbcp.jar,commons-modeler.jar,commons-logging-api.jar,commons-beanutils.jar,commons-fileupload-1.0.jar,commons-pool.jar,commons-digester.jar,commons-logging.jar,commons-collections.jar,commons-el.jar,jakarta-regexp-1.2.jar,jasper-compiler.jar,jasper-runtime.jar,jmx.jar,jmx-tools.jar,jsp-api.jar,jkshm.jar,jkconfig.jar,naming-common.jar,naming-resources.jar,naming-factory.jar,naming-java.jar,servlet-api.jar,servlets-default.jar,servlets-invoker.jar,servlets-common.jar,servlets-webdav.jar,tomcat-util.jar,tomcat-http11.jar,tomcat-jni.jar,tomcat-jk.jar,tomcat-jk2.jar,tomcat-coyote.jar,xercesImpl.jar,xmlParserAPIs.jar,sunjce_provider.jar,ldapsec.jar,localedata.jar,dnsns.jar
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf catalina.properties

2003-09-23 Thread luehe 
luehe   2003/09/23 14:10:28

  Modified:catalina/src/conf catalina.properties
  Log:
  Added noTldJars property
  
  Revision  ChangesPath
  1.8   +5 -0  jakarta-tomcat-catalina/catalina/src/conf/catalina.properties
  
  Index: catalina.properties
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/catalina.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- catalina.properties   3 Jan 2003 15:39:53 -   1.7
  +++ catalina.properties   23 Sep 2003 21:10:28 -  1.8
  @@ -53,3 +53,8 @@
   #  repositories
   # foo/bar.jar: Add bar.jar as a class repository 
   shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
  +
  +#
  +# List of comma-separated names of JAR files that are known not to contain
  +# any TLDs
  
+noTldJars=ant.jar,catalina.jar,catalina-ant.jar,catalina-cluster.jar,catalina-optional.jar,catalina-i18n-fr.jar,catalina-i18n-ja.jar,catalina-i18n-es.jar,commons-dbcp.jar,commons-modeler.jar,commons-logging-api.jar,commons-beanutils.jar,commons-fileupload-1.0.jar,commons-pool.jar,commons-digester.jar,commons-logging.jar,commons-collections.jar,commons-el.jar,jakarta-regexp-1.2.jar,jasper-compiler.jar,jasper-runtime.jar,jmx.jar,jmx-tools.jar,jsp-api.jar,jkshm.jar,jkconfig.jar,naming-common.jar,naming-resources.jar,naming-factory.jar,naming-java.jar,servlet-api.jar,servlets-default.jar,servlets-invoker.jar,servlets-common.jar,servlets-webdav.jar,tomcat-util.jar,tomcat-http11.jar,tomcat-jni.jar,tomcat-jk.jar,tomcat-jk2.jar,tomcat-coyote.jar,xercesImpl.jar,xmlParserAPIs.jar,sunjce_provider.jar,ldapsec.jar,localedata.jar,dnsns.jar
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf catalina.properties

2003-01-03 Thread remm 
remm2003/01/03 07:39:53

  Modified:catalina/src/conf catalina.properties
  Log:
  - Shared is based on catalina.base by default.
  
  Revision  ChangesPath
  1.7   +1 -1  jakarta-tomcat-catalina/catalina/src/conf/catalina.properties
  
  Index: catalina.properties
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/catalina.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- catalina.properties   13 Dec 2002 21:57:26 -  1.6
  +++ catalina.properties   3 Jan 2003 15:39:53 -   1.7
  @@ -52,4 +52,4 @@
   # foo/*.jar: Add all the JARs of the specified folder as class 
   #  repositories
   # foo/bar.jar: Add bar.jar as a class repository 
  -shared.loader=${catalina.home}/shared/classes,${catalina.home}/shared/lib/*.jar
  +shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf catalina.properties catalina.policy

2002-11-04 Thread jfarcand 
jfarcand2002/11/04 12:22:44

  Modified:catalina/src/conf catalina.properties catalina.policy
  Log:
  Partial fix for the new JSP 2.0 features running under the SecurityManager. The 
generated code needs some special permissions in order to run properly. Even when we 
do not protect any packages, the JSP 2.0 stuff still not works. Special permissions or 
doPrivileged block will needs to be added to the the generated code in order to work 
properly. This partial fix allows the JSP 2.0 example to run under the SecurityManager.
  
  Revision  ChangesPath
  1.5   +2 -3  jakarta-tomcat-catalina/catalina/src/conf/catalina.properties
  
  Index: catalina.properties
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/catalina.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- catalina.properties   4 Nov 2002 05:33:50 -   1.4
  +++ catalina.properties   4 Nov 2002 20:22:43 -   1.5
   -4,8 +4,7 
   # 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.compiler.,org.apache.jasper.core.,org.apache.jasper.logging.,org.apache.jasper.resources.,org.apache.jasper.servlet.,org.apache.jasper.util.,org.apache.jasper.xmlparser
  -
  
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
   #
   # List of comma-separated packages that start with or equal this string
   # will cause a security exception to be thrown when
   -16,7 +15,7 
   # 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.compiler.,org.apache.jasper.core.,org.apache.jasper.logging.,org.apache.jasper.resources.,org.apache.jasper.servlet.,org.apache.jasper.util.,org.apache.jasper.xmlparser
  
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
   
   #
   #
  
  
  
  1.6   +6 -1  jakarta-tomcat-catalina/catalina/src/conf/catalina.policy
  
  Index: catalina.policy
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/catalina.policy,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- catalina.policy   4 Nov 2002 16:43:31 -   1.5
  +++ catalina.policy   4 Nov 2002 20:22:43 -   1.6
   -63,6 +63,11 
   permission java.security.AllPermission;
   };
   
  +// The new JSP 2.0 implementation needs some special privileges in order to work.
  +// FIX ME: Need to reduce the permission scope.
  +grant codeBase file:${catalina.home}/webapps/jsp-examples/- {
  +  permission java.security.AllPermission;  
  +};
   
   // == WEB APPLICATION PERMISSIONS =
   
  
  
  

--
To unsubscribe, e-mail:   mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org

cvs commit: jakarta-tomcat-catalina/catalina/src/conf catalina.properties

2002-11-03 Thread jfarcand 
jfarcand2002/11/03 21:33:50

  Modified:catalina/src/conf catalina.properties
  Log:
  Use the catalina.properties file to customize the package protection/access. This 
new security m
  echanism enable the customization, at runtime, of which package should be protected.
  
  the following package will be protected by default:
  
  o.a.catalina
  o.a.jasper(*)
  o.a.coyote
  o.a.tomcat.util
  
  (*) Tomcat 5 is broken when a JSP use a class from jsp20el.jar and when the 
SecurityManager is t
  urned on. Even if you remove all the protection, Tomcat fail to properly runs the 
example.
  
  o.a.coyote.tomcat5 has been securized in order to support package protection.
  
  Revision  ChangesPath
  1.4   +3 -2  jakarta-tomcat-catalina/catalina/src/conf/catalina.properties
  
  Index: catalina.properties
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/catalina.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- catalina.properties   4 Nov 2002 05:12:56 -   1.3
  +++ catalina.properties   4 Nov 2002 05:33:50 -   1.4
   -4,7 +4,7 
   # passed to checkPackageAccess unless the
   # corresponding RuntimePermission (accessClassInPackage.+package) has
   # been granted.
  
-package.access=sun.,org.apache.catalina.,org.apache.jasper.,org.apache.coyote.,org.apache.tomcat.,org.apache.jsp.
  
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.compiler.,org.apache.jasper.core.,org.apache.jasper.logging.,org.apache.jasper.resources.,org.apache.jasper.servlet.,org.apache.jasper.util.,org.apache.jasper.xmlparser
   
   #
   # List of comma-separated packages that start with or equal this string
   -16,8 +16,9 
   # 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.jasper.,org.apache.coyote.,org.apache.tomcat.,org.apache.jsp
  
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.compiler.,org.apache.jasper.core.,org.apache.jasper.logging.,org.apache.jasper.resources.,org.apache.jasper.servlet.,org.apache.jasper.util.,org.apache.jasper.xmlparser
   
  +#
   #
   # List of comma-separated paths defining the contents of the common 
   # classloader. Prefixes should be used to define what is the repository type.
  
  
  

--
To unsubscribe, e-mail:   mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org

cvs commit: jakarta-tomcat-catalina/catalina/src/conf catalina.properties

2002-10-24 Thread remm 
remm2002/10/24 06:53:33

  Modified:catalina/src/conf catalina.properties
  Log:
  - Since it didn't get vetoed, I'm going forward with the CL configurability feature.
  - Adds new catalina.properties file which allows to configure the three Catalina
classloaders. This should allow to embed Tomcat in a more flexible way
without using the Embedded class.
  - The functionality is far from being done. For example, it would be desirable to
be able to specify the configuration source (currently hardcoded to
conf/server.xml) in the properties file.
  
  Revision  ChangesPath
  1.2   +3 -4  jakarta-tomcat-catalina/catalina/src/conf/catalina.properties
  
  Index: catalina.properties
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/catalina.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- catalina.properties   17 Oct 2002 14:52:03 -  1.1
  +++ catalina.properties   24 Oct 2002 13:53:33 -  1.2
   -28,7 +28,7 
   # 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=common/classes,common/lib/*.jar
  
+common.loader=${catalina.home}/common/classes,${catalina.home}/common/endorsed/*.jar,${catalina.home}/common/lib/*.jar
   
   #
   # List of comma-separated paths defining the contents of the server 
   -40,7 +40,7 
   # 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=server/classes,server/lib/*.jar
  +server.loader=${catalina.home}/server/classes,${catalina.home}/server/lib/*.jar
   
   #
   # List of comma-separated paths defining the contents of the shared 
   -52,5 +52,4 
   # foo/*.jar: Add all the JARs of the specified folder as class 
   #  repositories
   # foo/bar.jar: Add bar.jar as a class repository 
  -shared.loader=shared/classes,shared/lib/*.jar
  -
  +shared.loader=${catalina.home}/shared/classes,${catalina.home}/shared/lib/*.jar
  
  
  

--
To unsubscribe, e-mail:   mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org

cvs commit: jakarta-tomcat-catalina/catalina/src/conf catalina.properties

2002-10-18 Thread remm 
remm2002/10/17 07:52:03

  Added:   catalina/src/conf catalina.properties
  Log:
  - Add my catalina.properties proposal (it this is voted down, the file can be 
removed,
renamed or enhanced further).
  - This file would eventually get abstracted through a JNDI dircontext. In the
default configuration, Tomcat would use that file, but remote JNDI providers
could also be used, as for the rest of the cionfig if everything switches to JNDI.
  - The resource would be included in the classpath inside bootstrap..jar in the
default distribution.
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-catalina/catalina/src/conf/catalina.properties
  
  Index: catalina.properties
  ===
  #
  # 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.
  
  #
  # 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=
  
  #
  # 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 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=common/classes,common/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 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=server/classes,server/lib/*.jar
  
  #
  # 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 
  shared.loader=shared/classes,shared/lib/*.jar
  
  
  
  

--
To unsubscribe, e-mail:   mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org