[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed
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 33 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: r1377275 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java
Author: kkolinko Date: Sat Aug 25 12:06:02 2012 New Revision: 1377275 URL: http://svn.apache.org/viewvc?rev=1377275&view=rev Log: Merged revision 1376994 from tomcat/trunk: Fix Javadoc comment typo Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1376994 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=1377275&r1=1377274&r2=1377275&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java Sat Aug 25 12:06:02 2012 @@ -1891,7 +1891,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: r1377292 - /tomcat/trunk/conf/catalina.properties
Author: kkolinko Date: Sat Aug 25 13:24:53 2012 New Revision: 1377292 URL: http://svn.apache.org/viewvc?rev=1377292&view=rev Log: Add two files to the value of tomcat.util.scan.DefaultJarScanner.jarsToSkip property. These are from OpenJDK 6 on Fedora Linux (java-1.6.0-openjdk-1.6.0.0-65.1.10.8) They are audio library PulseAudio and GNOME Java Access Bridge. Modified: tomcat/trunk/conf/catalina.properties Modified: tomcat/trunk/conf/catalina.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1377292&r1=1377291&r2=1377292&view=diff == --- tomcat/trunk/conf/catalina.properties (original) +++ tomcat/trunk/conf/catalina.properties Sat Aug 25 13:24:53 2012 @@ -88,6 +88,7 @@ shared.loader= # - Tomcat JARs # - Common non-Tomcat JARs # - Sun JDK JARs +# - OpenJDK JARs # - Apple JDK JARs tomcat.util.scan.DefaultJarScanner.jarsToSkip=\ bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\ @@ -111,6 +112,7 @@ xercesImpl.jar,xmlParserAPIs.jar,xml-api 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,\ +gnome-java-bridge.jar,pulse-java.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,\ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377297 - in /tomcat/tc7.0.x/trunk: ./ conf/catalina.properties webapps/docs/changelog.xml
Author: kkolinko Date: Sat Aug 25 13:47:13 2012 New Revision: 1377297 URL: http://svn.apache.org/viewvc?rev=1377297&view=rev Log: Merged revision 1377292 from tomcat/trunk: Add two files to the value of tomcat.util.scan.DefaultJarScanner.jarsToSkip property. These are from OpenJDK 6 on Fedora Linux (java-1.6.0-openjdk-1.6.0.0-65.1.10.8) They are audio library PulseAudio and GNOME Java Access Bridge. Several jars were already added in r1377085, so I am including Mark in the credits. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/conf/catalina.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1377292 Modified: tomcat/tc7.0.x/trunk/conf/catalina.properties URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.properties?rev=1377297&r1=1377296&r2=1377297&view=diff == --- tomcat/tc7.0.x/trunk/conf/catalina.properties (original) +++ tomcat/tc7.0.x/trunk/conf/catalina.properties Sat Aug 25 13:47:13 2012 @@ -88,6 +88,7 @@ shared.loader= # - Tomcat JARs # - Common non-Tomcat JARs # - Sun JDK JARs +# - OpenJDK JARs # - Apple JDK JARs tomcat.util.scan.DefaultJarScanner.jarsToSkip=\ bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\ @@ -111,6 +112,7 @@ xercesImpl.jar,xmlParserAPIs.jar,xml-api 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,\ +gnome-java-bridge.jar,pulse-java.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,\ Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1377297&r1=1377296&r2=1377297&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Aug 25 13:47:13 2012 @@ -151,9 +151,13 @@ 53714: Provide separate system properties to control which JARs are excluded from which scans when using the JarScanner. This -allows JARs to be excluded from TLD scanning and/or Servlet 3.0 -pluggability scanning. (markt) - +allows JARs to be excluded from all scans or only from TLD scanning +and/or Servlet 3.0 pluggability scanning. (markt) + + +Add several JDK libraries to the value of jarsToSkip +property in the catalina.properties file. (markt, kkolinko) + - 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
https://issues.apache.org/bugzilla/show_bug.cgi?id=53777 --- Comment #4 from Konstantin Kolinko --- (In reply to comment #1) > 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) If your is in conf/context.xml this behaviour is as expected, because the conf/context.xml file is shared by all web applications, including the Manager one. If you observe it is different circumstances, please file a separate bug report and include the stacktrace from the thread that calls parseClassNames. (If TCCL is set incorrectly by the calling thread that would be a bug). -- 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: r1377311 - in /tomcat/trunk: java/org/apache/catalina/valves/AccessLogValve.java webapps/docs/config/valve.xml
Author: kkolinko
Date: Sat Aug 25 15:37:26 2012
New Revision: 1377311
URL: http://svn.apache.org/viewvc?rev=1377311&view=rev
Log:
Mention the %{xxx}t pattern in AccessLogValve javadoc.
Correct markup in valve.xml. ( cannot be nested in )
Modified:
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/webapps/docs/config/valve.xml
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1377311&r1=1377310&r2=1377311&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Sat Aug 25
15:37:26 2012
@@ -110,6 +110,8 @@ import org.apache.tomcat.util.buf.B2CCon
* %{xxx}c for a specific cookie
* %{xxx}r xxx is an attribute in the ServletRequest
* %{xxx}s xxx is an attribute in the HttpSession
+ * %{xxx}t xxx is an enhanced SimpleDateFormat pattern
+ * (see Configuration Reference document for details on supported time
patterns)
*
*
*
Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1377311&r1=1377310&r2=1377311&view=diff
==
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Sat Aug 25 15:37:26 2012
@@ -268,24 +268,24 @@
All formats supported by SimpleDateFormat are allowed in
%{xxx}t.
-In addition the following extensions have been added:
+In addition the following extensions have been added:
sec - number of seconds since the epoch
msec - number of milliseconds since the epoch
msec_frac - millisecond fraction
-These formats can not be mixed with SimpleDateFormat formats in the same
format
+These formats can not be mixed with SimpleDateFormat formats in the
same format
token.
Furthermore one can define whether to log the timestamp for the request
start
-time or the response finish time:
+time or the response finish time:
begin or prefix begin: chooses
the request start time
end or prefix end: chooses
the response finish time
-By adding multiple %{xxx}t tokens to the pattern, one can
+By adding multiple %{xxx}t tokens to the pattern, one can
also log both timestamps.
The shorthand pattern pattern="common"
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377312 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/AccessLogValve.java webapps/docs/config/valve.xml
Author: kkolinko
Date: Sat Aug 25 15:39:45 2012
New Revision: 1377312
URL: http://svn.apache.org/viewvc?rev=1377312&view=rev
Log:
Merged revision 1377311 from tomcat/trunk:
Mention the %{xxx}t pattern in AccessLogValve javadoc.
Correct markup in valve.xml. ( cannot be nested in )
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1377311
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1377312&r1=1377311&r2=1377312&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Sat Aug 25 15:39:45 2012
@@ -110,6 +110,8 @@ import org.apache.tomcat.util.buf.B2CCon
* %{xxx}c for a specific cookie
* %{xxx}r xxx is an attribute in the ServletRequest
* %{xxx}s xxx is an attribute in the HttpSession
+ * %{xxx}t xxx is an enhanced SimpleDateFormat pattern
+ * (see Configuration Reference document for details on supported time
patterns)
*
*
*
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml?rev=1377312&r1=1377311&r2=1377312&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml Sat Aug 25 15:39:45 2012
@@ -268,24 +268,24 @@
All formats supported by SimpleDateFormat are allowed in
%{xxx}t.
-In addition the following extensions have been added:
+In addition the following extensions have been added:
sec - number of seconds since the epoch
msec - number of milliseconds since the epoch
msec_frac - millisecond fraction
-These formats can not be mixed with SimpleDateFormat formats in the same
format
+These formats can not be mixed with SimpleDateFormat formats in the
same format
token.
Furthermore one can define whether to log the timestamp for the request
start
-time or the response finish time:
+time or the response finish time:
begin or prefix begin: chooses
the request start time
end or prefix end: chooses
the response finish time
-By adding multiple %{xxx}t tokens to the pattern, one can
+By adding multiple %{xxx}t tokens to the pattern, one can
also log both timestamps.
The shorthand pattern pattern="common"
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377319 - in /tomcat/trunk/java/org/apache/jasper: JspC.java JspCompilationContext.java
Author: markt
Date: Sat Aug 25 16:30:53 2012
New Revision: 1377319
URL: http://svn.apache.org/viewvc?rev=1377319&view=rev
Log:
A little Java 7 / UCDetector clean-up
Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1377319&r1=1377318&r2=1377319&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Sat Aug 25 16:30:53 2012
@@ -132,7 +132,7 @@ public class JspC extends Task implement
protected static final int ALL_WEBXML = 20;
protected static final int DEFAULT_DIE_LEVEL = 1;
protected static final int NO_DIE_LEVEL = 0;
-protected static final Set insertBefore = new HashSet();
+protected static final Set insertBefore = new HashSet<>();
static {
insertBefore.add("");
@@ -171,8 +171,7 @@ public class JspC extends Task implement
protected boolean smapSuppressed = true;
protected boolean smapDumped = false;
protected boolean caching = true;
-protected final Map cache =
-new HashMap();
+protected final Map cache = new HashMap<>();
protected String compiler = null;
@@ -196,7 +195,7 @@ public class JspC extends Task implement
/**
* The pages.
*/
-protected final List pages = new Vector();
+protected final List pages = new Vector<>();
/**
* Needs better documentation, this data member does.
@@ -775,7 +774,7 @@ public class JspC extends Task implement
protected void addExtension(final String extension) {
if(extension != null) {
if(extensions == null) {
-extensions = new Vector();
+extensions = new Vector<>();
}
extensions.add(extension);
@@ -1222,7 +1221,7 @@ public class JspC extends Task implement
* jsps are specified.
*/
public void scanFiles( File base ) throws JasperException {
-Stack dirs = new Stack();
+Stack dirs = new Stack<>();
dirs.push(base.toString());
// Make sure default extensions are always included
@@ -1450,7 +1449,7 @@ public class JspC extends Task implement
}
// Turn the classPath into URLs
-ArrayList urls = new ArrayList();
+ArrayList urls = new ArrayList<>();
StringTokenizer tokenizer = new StringTokenizer(classPath,
File.pathSeparator);
while (tokenizer.hasMoreTokens()) {
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1377319&r1=1377318&r2=1377319&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Sat Aug 25
16:30:53 2012
@@ -62,27 +62,27 @@ public class JspCompilationContext {
private final Log log = LogFactory.getLog(JspCompilationContext.class); //
must not be static
-protected Map tagFileJarUrls;
+protected final Map tagFileJarUrls;
protected String className;
-protected String jspUri;
+protected final String jspUri;
protected String basePackageName;
protected String derivedPackageName;
protected String servletJavaFileName;
protected String javaPath;
protected String classFileName;
protected ServletWriter writer;
-protected Options options;
-protected JspServletWrapper jsw;
+protected final Options options;
+protected final JspServletWrapper jsw;
protected Compiler jspCompiler;
protected String classPath;
-protected String baseURI;
+protected final String baseURI;
protected String outputDir;
-protected ServletContext context;
+protected final ServletContext context;
protected ClassLoader loader;
-protected JspRuntimeContext rctxt;
+protected final JspRuntimeContext rctxt;
protected volatile int removed = 0;
@@ -90,10 +90,10 @@ public class JspCompilationContext {
protected URL baseUrl;
protected Class servletClass;
-protected boolean isTagFile;
+protected final boolean isTagFile;
protected boolean protoTypeMode;
protected TagInfo tagInfo;
-protected JarResource tagJarResource;
+protected final JarResource tagJarResource;
// jspURI _must_ be relative to the context
public JspCompilationContext(String jspUri,
@@ -102,12 +102,35 @@ public class JspCompilationContext {
JspServletWrapper jsw,
JspRuntimeContext rctxt)
svn commit: r1377321 - /tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
Author: markt
Date: Sat Aug 25 16:38:00 2012
New Revision: 1377321
URL: http://svn.apache.org/viewvc?rev=1377321&view=rev
Log:
Simplify and silence a FindBugs report (Note: there would not have been a
problem if an increment has been lost)
Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1377321&r1=1377320&r2=1377321&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Sat Aug 25
16:38:00 2012
@@ -84,7 +84,7 @@ public class JspCompilationContext {
protected final JspRuntimeContext rctxt;
-protected volatile int removed = 0;
+protected volatile boolean removed = false;
protected URLClassLoader jspLoader;
protected URL baseUrl;
@@ -592,17 +592,14 @@ public class JspCompilationContext {
// Removal
public void incrementRemoved() {
-if (removed == 0 && rctxt != null) {
+if (removed == false && rctxt != null) {
rctxt.removeWrapper(jspUri);
}
-removed++;
+removed = true;
}
public boolean isRemoved() {
-if (removed > 0 ) {
-return true;
-}
-return false;
+return removed;
}
// Compile and reload
@@ -656,7 +653,7 @@ public class JspCompilationContext {
throw new
JasperException(Localizer.getMessage("jsp.error.unable.compile"),
ex);
}
-removed = 0;
+removed = false;
return servletClass;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377335 - in /tomcat/trunk/test/org/apache/coyote/http11: TestAbstractHttp11Processor.java filters/TestFlushableGZIPOutputStream.java
Author: markt
Date: Sat Aug 25 18:53:16 2012
New Revision: 1377335
URL: http://svn.apache.org/viewvc?rev=1377335&view=rev
Log:
Java 7 <>
Modified:
tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
tomcat/trunk/test/org/apache/coyote/http11/filters/TestFlushableGZIPOutputStream.java
Modified:
tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java?rev=1377335&r1=1377334&r2=1377335&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
Sat Aug 25 18:53:16 2012
@@ -264,8 +264,7 @@ public class TestAbstractHttp11Processor
tomcat.start();
ByteChunk responseBody = new ByteChunk();
-Map> responseHeaders =
-new HashMap>();
+Map> responseHeaders = new HashMap<>();
int rc = getUrl("http://localhost:"; + getPort() + "/test",
responseBody,
responseHeaders);
@@ -294,8 +293,7 @@ public class TestAbstractHttp11Processor
tomcat.start();
ByteChunk responseBody = new ByteChunk();
-Map> responseHeaders =
-new HashMap>();
+Map> responseHeaders = new HashMap<>();
int rc = getUrl("http://localhost:"; + getPort() + "/test",
responseBody,
responseHeaders);
Modified:
tomcat/trunk/test/org/apache/coyote/http11/filters/TestFlushableGZIPOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/filters/TestFlushableGZIPOutputStream.java?rev=1377335&r1=1377334&r2=1377335&view=diff
==
---
tomcat/trunk/test/org/apache/coyote/http11/filters/TestFlushableGZIPOutputStream.java
(original)
+++
tomcat/trunk/test/org/apache/coyote/http11/filters/TestFlushableGZIPOutputStream.java
Sat Aug 25 18:53:16 2012
@@ -47,7 +47,7 @@ public class TestFlushableGZIPOutputStre
OutputStream output = new FlushableGZIPOutputStream(byteOutStream);
File sourcesDir = new File("test/org/apache/coyote/http11/filters/");
-List parts = new ArrayList();
+List parts = new ArrayList<>();
byte[] part;
part = loadFile(new File(sourcesDir, "bug52121-part1"));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377342 - /tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
Author: markt
Date: Sat Aug 25 20:06:59 2012
New Revision: 1377342
URL: http://svn.apache.org/viewvc?rev=1377342&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53725
Fix corruption in some GZIP'd content
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java?rev=1377342&r1=1377341&r2=1377342&view=diff
==
---
tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
Sat Aug 25 20:06:59 2012
@@ -137,7 +137,6 @@ public class FlushableGZIPOutputStream e
if (len > 0) {
out.write(buf, 0, len);
}
-} while (len != 0);
+} while (!def.needsInput());
}
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1377343 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java webapps/docs/changelog.xml
Author: markt
Date: Sat Aug 25 20:08:41 2012
New Revision: 1377343
URL: http://svn.apache.org/viewvc?rev=1377343&view=rev
Log:
Fix corruption in some GZIP'd content
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1377342
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java?rev=1377343&r1=1377342&r2=1377343&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
Sat Aug 25 20:08:41 2012
@@ -137,7 +137,6 @@ public class FlushableGZIPOutputStream e
if (len > 0) {
out.write(buf, 0, len);
}
-} while (len != 0);
+} while (!def.needsInput());
}
-
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1377343&r1=1377342&r2=1377343&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Aug 25 20:08:41 2012
@@ -179,6 +179,9 @@
NullPointerException and could result in a JVM crash.
(markt)
+
+53725: Fix possible corruption of GZIP'd output. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53725] Some GZipped responses result in java.io.IOException: Corrupt GZIP trailer during gunzip.
https://issues.apache.org/bugzilla/show_bug.cgi?id=53725 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the test case. It made fixing this a whole lot easier than it would otherwise have been. The fix has been applied to trunk and 7.0.x and will be included in 7.0.30 onwards. I haven't included the test case in the unit tests due to the size of the file required to trigger this issue. (It would significantly increase the size of the source distribution.) -- 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
https://issues.apache.org/bugzilla/show_bug.cgi?id=53777 --- Comment #5 from eolivelli --- Sorry, I was using TomEE (Tomcat + OpenEJB). With a raw Tomcat the problem does not happen, I reported this problem on OpenEJB list -- 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
