[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed

2012-08-24 Thread Gump
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-taglibs-standard has an issue affecting its community 
integration.
This issue affects 2 projects,
 and has been outstanding for 31 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-taglibs-standard :  Standard Taglib
- tomcat-taglibs-standard-install :  JSP Taglibs


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Optional dependency httpunit failed with reason build failed
 -DEBUG- (Apache Gump generated) Apache Maven Settings in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
 -INFO- Failed with reason build failed
 -DEBUG- Maven POM in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml
 -INFO- Failed to extract fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html
Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build)
Work ended in a state of : Failed
Elapsed: 22 secs
Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings 
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml 
install 
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard]
M2_HOME: /opt/maven2
-
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Nothing to compile - all classes are up to date
[debug] execute contextualize
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/src/test/resources
[INFO] Copying 3 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] Tests are skipped.
[INFO] [bundle:bundle {execution: default-bundle}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing 
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/target/taglibs-standard-spec-1.2-SNAPSHOT.jar
 to 
/srv/gump/public/workspace/mvnlocalrepo/shared/org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] [bundle:install {execution: default-install}]
[INFO] Parsing 
file:/srv/gump/public/workspace/mvnlocalrepo/shared/repository.xml
[INFO] Installing 
org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] Writing OBR metadata
[INFO] 
[INFO] Building JSTL Implementation
[INFO]task-segment: [install]
[INFO] 
[INFO] [remote-resources:process {execution: default}]
[INFO] snapshot org.apache.taglibs:taglibs-standard-spec:1.2-SNAPSHOT: checking 
for updates from apache.snapshots
[debug] execute contextualize
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 14 resources
[INFO] Copying 3 resources
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 96 source files to 
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/target/classes
[INFO] -
[ERROR] COMPILATION ERROR : 
[INFO] -
[ERROR] 
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
 error: DataSourceWrapper is not abstract and does not override abstract method 
getParentLogger() in CommonDataSource
[INFO] 1 error
[INFO] -
[INFO] 
[ERROR] BUILD FAILURE
[INFO] 
[INFO] Compilation failure
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
 error: DataSourceWrapper is not abstract and does not override abstract method 
getParentLogger() in CommonDataSource

[INFO] 
[INFO] For more information, run Maven with the -e switch
[INFO] ---

svn commit: r1376874 - /tomcat/maven-plugin/trunk/src/site/site.xml

2012-08-24 Thread olamy
Author: olamy
Date: Fri Aug 24 09:35:37 2012
New Revision: 1376874

URL: http://svn.apache.org/viewvc?rev=1376874&view=rev
Log:
test last fluido skin

Modified:
tomcat/maven-plugin/trunk/src/site/site.xml

Modified: tomcat/maven-plugin/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1376874&r1=1376873&r2=1376874&view=diff
==
--- tomcat/maven-plugin/trunk/src/site/site.xml (original)
+++ tomcat/maven-plugin/trunk/src/site/site.xml Fri Aug 24 09:35:37 2012
@@ -30,7 +30,7 @@
   
 org.apache.maven.skins
 maven-fluido-skin
-1.2.2
+1.3.0-SNAPSHOT
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Request for JAASRealm enhancement

2012-08-24 Thread Konstantin Kolinko
2012/8/24 Enrico Olivelli :
> Hi,
> I was trying to use JAASRealm and I noticed that it is possibile to bundle
> my LoginModule with the webapp  (useContextClassLoader) but it is not
> possibile to bundle a login.properties files
>
> // this constructor uses default JVM JAAS Configuration
> // from JAASRealm.java
> loginContext = new LoginContext(appName, callbackHandler);
>
> // the constructor I would like to be used
> URI = URI that gets a .properties file thru the classloader of my app
> ConfigFile file = new ConfigFile(URI);
> loginContext = new LoginContext(appName, callbackHandler,...,ConfigFile);
>
> can you add a configuration property for that realm in order to configure a
> JAAS ConfigFile ?
> in this way I can bundle my login.properties file inside the app or in some
> JAR to be distributed
>

OK. I do not have plans to implement this by myself, but I like the idea.

You can file an enhancement request in Bugzilla. If you prepare a
patch, you can attach it there.

Several notes:
1). The order of parameters in LoginContext constructor that you are
proposing to use is different from what you wrote above and is

new LoginContext(appName, subject, callbackHandler, configuration);

With  subject=null and configuration=null it falls back to current behaviour of
new LoginContext(appName, callbackHandler);


2). ConfigFile belongs to "com.sun.security.auth.login" package which
is not part of the public API. As thus, it cannot be used in Tomcat as
compile-time dependency.

It can be created only via reflection.

3) ConfigFile is just one possible implementation of Configuration.
Someone may use others.

4) You should not create a new instance of configuration on each call
to authenticate(), because I expect that to be slow. It should be
created only once.

5). It would be nice if you could provide sample web application that
demonstrates the feature.  It would be even better to provide a
testcase, but I think a testcase might be harder to implement.

6). It would be nice if a patch included update for documentation. The
documentation for JAASRealm is in webapps/docs/config/realm.xml and
webapps/docs/realm-howto.xml

As a quick fix / proof of concept the following is possible:
1. I think you can subclass JAASRealm and replace its authenticate()
method by your own.
2. Creation of LoginContext instance could be extracted into a factory
method in Tomcat's JAASRealm.
That way you (in a subclass) could use whatever you want to configure
a new LoginContext instance.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53776] New: Multitenancy support for JDBCRealm

2012-08-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53776

  Priority: P2
Bug ID: 53776
  Assignee: dev@tomcat.apache.org
   Summary: Multitenancy support for JDBCRealm
  Severity: enhancement
Classification: Unclassified
  Reporter: bl...@gmx.net
  Hardware: PC
Status: NEW
   Version: trunk
 Component: Catalina
   Product: Tomcat 7

Hi,

in order to support multi-tenancy applications, JDBCRealm should get more
options:
See this logintable definition

CREATE TABLE t_login 
( 
 id INTEGER NOT NULL,
 tenant_id INTEGER NOT NULL,
 loginname VARCHAR2 (50 CHAR) NOT NULL, 
 sha1hash VARCHAR2 (40 CHAR) NOT NULL, 
 lastlogin DATE, 
 CONSTRAINT PK_login PRIMARY KEY (id),
 CONSTRAINT UC_login_tenant_loginname UNIQUE (tenant_id, loginname)
);

In order to make every loginname (e.g. "admin") available for every tenant, I
need to include the tenant_id within the UC.
For JDBCRealm login, which does a select with "WHERE loginname = j_username",
this means that it can get many rows as result. Obviously, this can't work out.

So in order have multitenancy support, the  tag needs two new
parameters, one "tenantColumnName" (no default, only used when included in tag)
and one "tenantId", also with no default.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53776] Multitenancy support for JDBCRealm

2012-08-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53776

S  changed:

   What|Removed |Added

   Hardware|PC  |All
 OS||All

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53756] org.apache.catalina.realm.JDBCRealm should have an option to return the user_id instead of the user_name

2012-08-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53756

S  changed:

   What|Removed |Added

 CC||bl...@gmx.net

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53776] Multitenancy support for JDBCRealm

2012-08-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53776

S  changed:

   What|Removed |Added

 CC||bl...@gmx.net

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53776] Multitenancy support for JDBCRealm

2012-08-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53776

--- Comment #1 from S  ---
I forgot:
Possible workaround for now:
- Leave table DDL as it is
- Create projection-view per tenant
- Create empty schema per tenant
- Grant select on correct view from main schema to each tenant
- Use tenant-schema to handle login (also good practice from security
perspective, as no data is known to Tomcat, Tomcat doesn't need to know)

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53777] New: Ability to bundle JAAS Configuration in Webappp

2012-08-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53777

  Priority: P2
Bug ID: 53777
  Assignee: dev@tomcat.apache.org
   Summary: Ability to bundle JAAS Configuration in Webappp
  Severity: enhancement
Classification: Unclassified
OS: All
  Reporter: eolive...@gmail.com
  Hardware: All
Status: NEW
   Version: unspecified
 Component: Catalina
   Product: Tomcat 7

I would like to let JAASRealm to load JAAS Configuration from a .properties
file bundled in a web application (either in WEB-INF/classes or in any JAR on
the classpath of the context)

Actually (7.0.29) JAASRealm creates a LoginContext using the 2-args constructor
loginContext = new LoginContext(appName, callbackHandler); 

I propose to add a new configuration parameter on JAASRealm to let it load a
javax.security.auth.login.Configuration from the ContextClassLoader

this new Configuration has to be passed to the 4-args constructor
loginContext = new LoginContext(appName, subject, callbackHandler,
configuration); 

http://docs.oracle.com/javase/6/docs/api/javax/security/auth/login/LoginContext.html#LoginContext%28java.lang.String,%20javax.security.auth.Subject,%20javax.security.auth.callback.CallbackHandler,%20javax.security.auth.login.Configuration%29

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53776] Multitenancy support for JDBCRealm

2012-08-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53776

--- Comment #2 from Konstantin Kolinko  ---
I would not recommend to use JDBCRealm in productive configurations. The
recommended replacement is DataSourceRealm.

> - Create projection-view per tenant
> - ...

Just creating the VIEW is enough, as the table names are configurable. There is
no need to create a separate schema per tenant.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53777] Ability to bundle JAAS Configuration in Webappp

2012-08-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53777

--- Comment #1 from eolivelli  ---
method parseClassNames in JAASRealm sometimes (not always) uses as
ContextClassLoader this one

WebappClassLoader
  context: /manager
  delegate: false
  repositories:
--> Parent Classloader:
org.apache.catalina.loader.StandardClassLoader@9fa0f19

In my case this causes JASSRealm not to find custom Principal classes
(userClassNames and roleClassNames)

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53777] Ability to bundle JAAS Configuration in Webappp

2012-08-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53777

--- Comment #2 from eolivelli  ---
Created attachment 29274
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=29274&action=edit
This is a subclass of JASSRealm that implements the feature

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53777] Ability to bundle JAAS Configuration in Webappp

2012-08-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53777

--- Comment #3 from eolivelli  ---
Created attachment 29275
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=29275&action=edit
Patch on JAASRealm (tomcat 7 trunk)

I tried to write a patch against JAASREalm.java (don't know if it is the
correct format)

Patch is for Tomcat 7 trunk

this is what is does:
- adds "configfile" property (will be resolved as
ClassLoader.getResource().toURI) to require the use of a custom JAAS
Configuration file
- instantiates a "sun" ConfigFile (using Reflection) to have a Configuration
- uses the 4-args constructor of LoginContext (in order to use the custom
configuration)
- sets a work-around for a bug in Realm setup (parseClassNames) because
sometimes that method is not called with a good contextclassloader

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1376994 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

2012-08-24 Thread markt
Author: markt
Date: Fri Aug 24 17:16:02 2012
New Revision: 1376994

URL: http://svn.apache.org/viewvc?rev=1376994&view=rev
Log:
Fix comment typo

Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1376994&r1=1376993&r2=1376994&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Aug 24 
17:16:02 2012
@@ -1779,7 +1779,7 @@ public class ContextConfig implements Li
 
 
 /**
- * Scan /META-INF/lib for JARs and for each one found add it and any
+ * Scan /WEB-INF/lib for JARs and for each one found add it and any
  * /META-INF/web-fragment.xml to the resulting Map. web-fragment.xml files
  * will be parsed before being added to the map. Every JAR will be added 
and
  * null will be used if no web-fragment.xml was found. Any 
JARs



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1377078 - in /tomcat/trunk: conf/ java/org/apache/catalina/startup/ java/org/apache/jasper/ java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ webapps/docs/config/

2012-08-24 Thread markt
Author: markt
Date: Fri Aug 24 20:05:41 2012
New Revision: 1377078

URL: http://svn.apache.org/viewvc?rev=1377078&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53714
Provide a means of excluding JARs from pluggability scans, TLD scans or all 
scans.

Modified:
tomcat/trunk/conf/catalina.properties
tomcat/trunk/java/org/apache/catalina/startup/Constants.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/trunk/java/org/apache/jasper/Constants.java
tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/webapps/docs/config/systemprops.xml

Modified: tomcat/trunk/conf/catalina.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1377078&r1=1377077&r2=1377078&view=diff
==
--- tomcat/trunk/conf/catalina.properties (original)
+++ tomcat/trunk/conf/catalina.properties Fri Aug 24 20:05:41 2012
@@ -73,8 +73,12 @@ server.loader=
 # starting with file:.
 shared.loader=
 
-# List of JAR files that should not be scanned for configuration information
-# such as web fragments, TLD files etc. It must be a comma separated list of
+# List of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. Scan specific lists (to exclude JARs
+# from individual scans) follow this. The list must be a comma separated list 
of
 # JAR file names.
 # The JARs listed below include:
 # - Tomcat Bootstrap JARs
@@ -104,14 +108,24 @@ geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\
 
ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\
 jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar,\
 xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\
-dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar,sunmscapi.jar,\
-sunpkcs11.jar,jhall.jar,tools.jar,\
+access-bridge-64.jar,dnsns.jar,jaccess.jar,ldapsec.jar,localedata.jar,\
+sunjce_provider.jar,sunmscapi.jar,sunpkcs11.jar,jhall.jar,tools.jar,\
 sunec.jar,zipfs.jar,\
 apple_provider.jar,AppleScriptEngine.jar,CoreAudio.jar,dns_sd.jar,\
 j3daudio.jar,j3dcore.jar,j3dutils.jar,jai_core.jar,jai_codec.jar,\
 mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar,\
 junit.jar,junit-*.jar,ant-launcher.jar
 
+# Additional JARs (over and above the default JARs listed above) to skip when
+# scanning for Servlet 3.0 pluggability features. These features include web
+# fragments, annotations, SCIs and classes that match @HandlesTypes. The list
+# must be a comma separated list of JAR file names.
+org.apache.catalina.startup.ContextConfig.jarsToSkip=
+
+# Additional JARs (over and above the default JARs listed above) to skip when
+# scanning for TLDs. The list must be a comma separated list of JAR file names.
+org.apache.catalina.startup.TldConfig.jarsToSkip=
+
 #
 # String cache configuration.
 tomcat.util.buf.StringCache.byte.enabled=true

Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=1377078&r1=1377077&r2=1377078&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Fri Aug 24 
20:05:41 2012
@@ -38,6 +38,13 @@ public final class Constants {
 public static final String HostContextXml = "context.xml.default";
 public static final String HostWebXml = "web.xml.default";
 
+public static final String DEFAULT_JARS_TO_SKIP =
+"tomcat.util.scan.DefaultJarScanner.jarsToSkip";
+public static final String PLUGGABILITY_JARS_TO_SKIP =
+"org.apache.catalina.startup.ContextConfig.jarsToSkip";
+public static final String TLD_JARS_TO_SKIP =
+"org.apache.catalina.startup.TldConfig.jarsToSkip";
+
 /**
  * A dummy value used to suppress loading the default web.xml file.
  *

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1377078&r1=1377077&r2=1377078&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Aug 24 
20:05:41 2012
@@ -41,6 +41,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import 

svn commit: r1377085 - in /tomcat/tc7.0.x/trunk: ./ conf/ java/org/apache/catalina/startup/ java/org/apache/jasper/ java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ webapps/docs/ web

2012-08-24 Thread markt
Author: markt
Date: Fri Aug 24 20:21:07 2012
New Revision: 1377085

URL: http://svn.apache.org/viewvc?rev=1377085&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53714
Provide a means of excluding JARs from pluggability scans, TLD scans or all 
scans.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/conf/catalina.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java

tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1377078

Modified: tomcat/tc7.0.x/trunk/conf/catalina.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.properties?rev=1377085&r1=1377084&r2=1377085&view=diff
==
--- tomcat/tc7.0.x/trunk/conf/catalina.properties (original)
+++ tomcat/tc7.0.x/trunk/conf/catalina.properties Fri Aug 24 20:21:07 2012
@@ -73,8 +73,12 @@ server.loader=
 # starting with file:.
 shared.loader=
 
-# List of JAR files that should not be scanned for configuration information
-# such as web fragments, TLD files etc. It must be a comma separated list of
+# List of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. Scan specific lists (to exclude JARs
+# from individual scans) follow this. The list must be a comma separated list 
of
 # JAR file names.
 # The JARs listed below include:
 # - Tomcat Bootstrap JARs
@@ -104,14 +108,24 @@ geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\
 
ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\
 jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar,\
 xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\
-dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar,sunmscapi.jar,\
-sunpkcs11.jar,jhall.jar,tools.jar,\
+access-bridge-64.jar,dnsns.jar,jaccess.jar,ldapsec.jar,localedata.jar,\
+sunjce_provider.jar,sunmscapi.jar,sunpkcs11.jar,jhall.jar,tools.jar,\
 sunec.jar,zipfs.jar,\
 apple_provider.jar,AppleScriptEngine.jar,CoreAudio.jar,dns_sd.jar,\
 j3daudio.jar,j3dcore.jar,j3dutils.jar,jai_core.jar,jai_codec.jar,\
 mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar,\
 junit.jar,junit-*.jar,ant-launcher.jar
 
+# Additional JARs (over and above the default JARs listed above) to skip when
+# scanning for Servlet 3.0 pluggability features. These features include web
+# fragments, annotations, SCIs and classes that match @HandlesTypes. The list
+# must be a comma separated list of JAR file names.
+org.apache.catalina.startup.ContextConfig.jarsToSkip=
+
+# Additional JARs (over and above the default JARs listed above) to skip when
+# scanning for TLDs. The list must be a comma separated list of JAR file names.
+org.apache.catalina.startup.TldConfig.jarsToSkip=
+
 #
 # String cache configuration.
 tomcat.util.buf.StringCache.byte.enabled=true

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Constants.java?rev=1377085&r1=1377084&r2=1377085&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Constants.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Constants.java Fri 
Aug 24 20:21:07 2012
@@ -38,6 +38,13 @@ public final class Constants {
 public static final String HostContextXml = "context.xml.default";
 public static final String HostWebXml = "web.xml.default";
 
+public static final String DEFAULT_JARS_TO_SKIP =
+"tomcat.util.scan.DefaultJarScanner.jarsToSkip";
+public static final String PLUGGABILITY_JARS_TO_SKIP =
+"org.apache.catalina.startup.ContextConfig.jarsToSkip";
+public static final String TLD_JARS_TO_SKIP =
+"org.apache.catalina.startup.TldConfig.jarsToSkip";
+
 /**
  * A dummy value used to suppress loading the default web.xml file.
  *

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1377085&r

[Bug 53714] misleading log output when jarsToSkip cointains web-fragments

2012-08-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53714

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
Fixed in trunk and 7.0.x and will be included in 7.0.30 onwards.

Note the fix was implemented using additional system properties. Determining if
a JAR had contributed to a Servlet 3.0 pluggability feature and then passing
that info the the TLD scanner would have been a much more invasive patch.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53717] HTTPS Connector not buffering results correctly

2012-08-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53717

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #2 from Mark Thomas  ---
I have traced this behaviour to the following:
http://hg.openjdk.java.net/jdk7u/jdk7u6-gate/jdk/diff/14d8cc19f227/src/share/classes/sun/security/ssl/AppOutputStream.java

Switching to TLSv1.1 or later reduces the problem but even switching to TLSv1.2
(available in Java 7) doesn't eliminate the problem entirely. There are still a
handful of small reads.

I haven't dug into this too much but this is definitely a JRE feature. It may
also be a side-effect of something the JRE has to do as part of the SSL/TLS
implementation. Generally, it appears the is.read() on a secure connection will
only ever read a single SSL data record even if multiple records are available
to read. I'd expect records to be read until the internal buffer was full.

Anyway, this is not a Tomcat problem.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org