svn commit: r1402014 - in /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc: naming/ pool/interceptor/
Author: markt
Date: Thu Oct 25 08:17:13 2012
New Revision: 1402014
URL: http://svn.apache.org/viewvc?rev=1402014view=rev
Log:
Fix some Eclipse warnings
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java?rev=1402014r1=1402013r2=1402014view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
Thu Oct 25 08:17:13 2012
@@ -66,7 +66,7 @@ public class GenericNamingResourcesFacto
if (addr.getContent()!=null) {
value = addr.getContent().toString();
}
-if (setProperty(o, param, value,false)) {
+if (setProperty(o, param, value)) {
} else {
log.debug(Property not configured[+param+]. No setter found
on[+o+].);
@@ -75,7 +75,8 @@ public class GenericNamingResourcesFacto
return o;
}
-public static boolean setProperty(Object o, String name, String
value,boolean invokeSetProperty) {
+@SuppressWarnings(null) // setPropertyMethodVoid can't be null when used
+private static boolean setProperty(Object o, String name, String value) {
if (log.isDebugEnabled())
log.debug(IntrospectionUtils: setProperty( +
o.getClass() + + name + = + value + ));
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1402014r1=1402013r2=1402014view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
Thu Oct 25 08:17:13 2012
@@ -45,7 +45,7 @@ public class SlowQueryReport extends Abs
* we will be keeping track of query stats on a per pool basis
*/
protected static
ConcurrentHashMapString,ConcurrentHashMapString,QueryStats perPoolStats =
-new ConcurrentHashMapString,ConcurrentHashMapString,QueryStats();
+new ConcurrentHashMap();
/**
* the queries that are used for this interceptor.
*/
@@ -137,7 +137,7 @@ public class SlowQueryReport extends Abs
//create the map to hold our stats
//however TODO we need to improve the eviction
//selection
-queries = new ConcurrentHashMapString,QueryStats();
+queries = new ConcurrentHashMap();
if (perPoolStats.putIfAbsent(pool.getName(), queries)!=null) {
//there already was one
queries = SlowQueryReport.perPoolStats.get(pool.getName());
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java?rev=1402014r1=1402013r2=1402014view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
Thu Oct 25 08:17:13 2012
@@ -66,7 +66,7 @@ public class SlowQueryReportJmx extends
protected static ConcurrentHashMapString,SlowQueryReportJmxMBean mbeans =
-new ConcurrentHashMapString,SlowQueryReportJmxMBean();
+new ConcurrentHashMap();
//==JMX STUFF
Modified:
svn commit: r1402018 - in /tomcat/trunk/test/org/apache/catalina: connector/ filters/ startup/ tribes/test/transport/
Author: markt
Date: Thu Oct 25 08:29:22 2012
New Revision: 1402018
URL: http://svn.apache.org/viewvc?rev=1402018view=rev
Log:
Fix Eclipse warnings in unit tests
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/trunk/test/org/apache/catalina/filters/TesterResponse.java
tomcat/trunk/test/org/apache/catalina/startup/BytesStreamer.java
tomcat/trunk/test/org/apache/catalina/startup/TestListener.java
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketReceive.java
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketSend.java
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java?rev=1402018r1=1402017r2=1402018view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java Thu Oct
25 08:29:22 2012
@@ -131,20 +131,21 @@ public class TestSendFile extends Tomcat
req.setAttribute(Globals.SENDFILE_FILE_END_ATTR, new
Long(f.length()));
} else {
byte[] c = new byte[8192];
-BufferedInputStream in = new BufferedInputStream(new
FileInputStream(f));
-int len = 0;
-int written = 0;
-long start = System.currentTimeMillis();
-do {
-len = in.read(c);
-if (len0) {
-resp.getOutputStream().write(c,0,len);
-written += len;
-}
-} while (len 0);
-System.out.println(Server Wrote +written + bytes in
+(System.currentTimeMillis()-start)+ ms.);
+try (BufferedInputStream in = new BufferedInputStream(
+new FileInputStream(f))) {
+int len = 0;
+int written = 0;
+long start = System.currentTimeMillis();
+do {
+len = in.read(c);
+if (len0) {
+resp.getOutputStream().write(c,0,len);
+written += len;
+}
+} while (len 0);
+System.out.println(Server Wrote +written + bytes in
+(System.currentTimeMillis()-start)+ ms.);
+}
}
-
}
}
Modified: tomcat/trunk/test/org/apache/catalina/filters/TesterResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TesterResponse.java?rev=1402018r1=1402017r2=1402018view=diff
==
--- tomcat/trunk/test/org/apache/catalina/filters/TesterResponse.java (original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TesterResponse.java Thu Oct
25 08:29:22 2012
@@ -82,15 +82,12 @@ public class TesterResponse
public void setError() {/* NOOP */}
public boolean isError() { return false; }
/**
- *
- * @return
* @throws IOException
*/
public ServletOutputStream createOutputStream() throws IOException {
return null;
}
/**
- *
* @throws IOException
*/
public void finishResponse() throws IOException {/* NOOP */}
@@ -100,7 +97,6 @@ public class TesterResponse
public PrintWriter getReporter() { return null; }
public void recycle() {/* NOOP */}
/**
- *
* @param b
* @throws IOException
*/
@@ -108,7 +104,6 @@ public class TesterResponse
// NOOP
}
/**
- *
* @param b
* @throws IOException
*/
@@ -116,7 +111,6 @@ public class TesterResponse
// NOOP
}
/**
- *
* @param b
* @param off
* @param len
Modified: tomcat/trunk/test/org/apache/catalina/startup/BytesStreamer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/BytesStreamer.java?rev=1402018r1=1402017r2=1402018view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/BytesStreamer.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/BytesStreamer.java Thu Oct 25
08:29:22 2012
@@ -24,22 +24,20 @@ package org.apache.catalina.startup;
*/
public interface BytesStreamer {
/**
- * Returns the length of the content about to be streamed.
- * Return -1 if length is unknown and chunked encoding should be used
- * @return the length if known - otherwise -1
+ * Get the length of the
[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 146 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: 24 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: r1402021 - /tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Author: kfujino
Date: Thu Oct 25 08:42:20 2012
New Revision: 1402021
URL: http://svn.apache.org/viewvc?rev=1402021view=rev
Log:
Add support for LAST_ACCESS_AT_START system property to PersistentManager.
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1402021r1=1402020r2=1402021view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Thu Oct 25 08:42:20 2012
@@ -901,8 +901,12 @@ public abstract class PersistentManagerB
synchronized (session) {
if (!session.isValid())
continue;
-int timeIdle = // Truncate, do not round up
-(int) ((timeNow - session.getThisAccessedTime()) /
1000L);
+int timeIdle;
+if (StandardSession.LAST_ACCESS_AT_START) {
+timeIdle = (int) ((timeNow -
session.getLastAccessedTime()) / 1000L);
+} else {
+timeIdle = (int) ((timeNow -
session.getThisAccessedTime()) / 1000L);
+}
if (timeIdle maxIdleSwap timeIdle minIdleSwap) {
if (session.accessCount != null
session.accessCount.get() 0) {
@@ -952,8 +956,12 @@ public abstract class PersistentManagerB
for (int i = 0; i sessions.length toswap 0; i++) {
StandardSession session = (StandardSession) sessions[i];
synchronized (session) {
-int timeIdle = // Truncate, do not round up
-(int) ((timeNow - session.getThisAccessedTime()) / 1000L);
+int timeIdle;
+if (StandardSession.LAST_ACCESS_AT_START) {
+timeIdle = (int) ((timeNow -
session.getLastAccessedTime()) / 1000L);
+} else {
+timeIdle = (int) ((timeNow -
session.getThisAccessedTime()) / 1000L);
+}
if (timeIdle minIdleSwap) {
if (session.accessCount != null
session.accessCount.get() 0) {
@@ -996,8 +1004,12 @@ public abstract class PersistentManagerB
synchronized (session) {
if (!session.isValid())
continue;
-int timeIdle = // Truncate, do not round up
-(int) ((timeNow - session.getThisAccessedTime()) /
1000L);
+int timeIdle;
+if (StandardSession.LAST_ACCESS_AT_START) {
+timeIdle = (int) ((timeNow -
session.getLastAccessedTime()) / 1000L);
+} else {
+timeIdle = (int) ((timeNow -
session.getThisAccessedTime()) / 1000L);
+}
if (timeIdle maxIdleBackup) {
if (log.isDebugEnabled())
log.debug(sm.getString
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1402024 - in /tomcat/trunk/test: org/apache/jasper/tagplugins/jstl/core/TestSet.java webapp-3.0/WEB-INF/tags/bug54012.tag webapp-3.0/bug54012.jsp
Author: markt
Date: Thu Oct 25 08:44:16 2012
New Revision: 1402024
URL: http://svn.apache.org/viewvc?rev=1402024view=rev
Log:
Test case for BZ54012
Added:
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
(with props)
tomcat/trunk/test/webapp-3.0/WEB-INF/tags/bug54012.tag
tomcat/trunk/test/webapp-3.0/bug54012.jsp (with props)
Added: tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java?rev=1402024view=auto
==
--- tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
(added)
+++ tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java Thu
Oct 25 08:44:16 2012
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jasper.tagplugins.jstl.core;
+
+import java.io.File;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.WebResourceRoot;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.webresources.StandardRoot;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestSet extends TomcatBaseTest {
+
+@Test
+public void testBug54011() throws Exception {
+}
+
+public void toFix() throws Exception {
+// TODO: Extract common code from this test and TestOut.java
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp-3.0);
+Context ctx = tomcat.addWebapp(null, /test,
appDir.getAbsolutePath());
+
+ctx.setResources(new StandardRoot(ctx));
+
+// Add the JSTL (we need the TLD)
+File lib = new File(webapps/examples/WEB-INF/lib);
+ctx.getResources().createWebResourceSet(
+WebResourceRoot.ResourceSetType.POST, lib.getAbsolutePath(),
+/WEB-INF/lib, );
+
+// Configure the use of the plug-in rather than the standard impl
+File plugin = new File(
+java/org/apache/jasper/tagplugins/jstl/tagPlugins.xml);
+ctx.getResources().createWebResourceSet(
+WebResourceRoot.ResourceSetType.POST, plugin.getAbsolutePath(),
+/WEB-INF/tagPlugins.xml, );
+
+tomcat.start();
+
+ByteChunk res = new ByteChunk();
+
+int rc = getUrl(http://localhost:; + getPort() +
+/test/bug54012.jsp, res, null);
+
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+String body = res.toString();
+Assert.assertTrue(body.contains(OK));
+}
+}
Propchange:
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
--
svn:eol-style = native
Added: tomcat/trunk/test/webapp-3.0/WEB-INF/tags/bug54012.tag
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/tags/bug54012.tag?rev=1402024view=auto
==
--- tomcat/trunk/test/webapp-3.0/WEB-INF/tags/bug54012.tag (added)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/tags/bug54012.tag Thu Oct 25 08:44:16
2012
@@ -0,0 +1,20 @@
+%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the License); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--%%@ tag %
+%@ taglib
svn commit: r1402025 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/session/PersistentManagerBase.java webapps/docs/changelog.xml
Author: kfujino
Date: Thu Oct 25 08:47:08 2012
New Revision: 1402025
URL: http://svn.apache.org/viewvc?rev=1402025view=rev
Log:
Add support for LAST_ACCESS_AT_START system property to PersistentManager.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1402025r1=1402024r2=1402025view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Thu Oct 25 08:47:08 2012
@@ -920,8 +920,12 @@ public abstract class PersistentManagerB
synchronized (session) {
if (!session.isValid())
continue;
-int timeIdle = // Truncate, do not round up
-(int) ((timeNow - session.getThisAccessedTime()) /
1000L);
+int timeIdle;
+if (StandardSession.LAST_ACCESS_AT_START) {
+timeIdle = (int) ((timeNow -
session.getLastAccessedTime()) / 1000L);
+} else {
+timeIdle = (int) ((timeNow -
session.getThisAccessedTime()) / 1000L);
+}
if (timeIdle maxIdleSwap timeIdle minIdleSwap) {
if (session.accessCount != null
session.accessCount.get() 0) {
@@ -971,8 +975,12 @@ public abstract class PersistentManagerB
for (int i = 0; i sessions.length toswap 0; i++) {
StandardSession session = (StandardSession) sessions[i];
synchronized (session) {
-int timeIdle = // Truncate, do not round up
-(int) ((timeNow - session.getThisAccessedTime()) / 1000L);
+int timeIdle;
+if (StandardSession.LAST_ACCESS_AT_START) {
+timeIdle = (int) ((timeNow -
session.getLastAccessedTime()) / 1000L);
+} else {
+timeIdle = (int) ((timeNow -
session.getThisAccessedTime()) / 1000L);
+}
if (timeIdle minIdleSwap) {
if (session.accessCount != null
session.accessCount.get() 0) {
@@ -1015,8 +1023,12 @@ public abstract class PersistentManagerB
synchronized (session) {
if (!session.isValid())
continue;
-int timeIdle = // Truncate, do not round up
-(int) ((timeNow - session.getThisAccessedTime()) /
1000L);
+int timeIdle;
+if (StandardSession.LAST_ACCESS_AT_START) {
+timeIdle = (int) ((timeNow -
session.getLastAccessedTime()) / 1000L);
+} else {
+timeIdle = (int) ((timeNow -
session.getThisAccessedTime()) / 1000L);
+}
if (timeIdle maxIdleBackup) {
if (log.isDebugEnabled())
log.debug(sm.getString
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=1402025r1=1402024r2=1402025view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 25 08:47:08 2012
@@ -60,6 +60,10 @@
bug53993/bug: Avoid a possible NPE in the AccessLogValve when the
session ID is logged and a session is invalidated. (markt)
/fix
+ fix
+Add support for LAST_ACCESS_AT_START system property to
+PersistentManager. (kfujino)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1402108 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Author: kfujino
Date: Thu Oct 25 11:51:10 2012
New Revision: 1402108
URL: http://svn.apache.org/viewvc?rev=1402108view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54045.
Make sure getMembers() returns available member when TcpFailureDetector works
in static cluster.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=1402108r1=1402107r2=1402108view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Thu Oct 25 11:51:10 2012
@@ -36,6 +36,7 @@ import org.apache.catalina.tribes.io.Cha
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.tribes.membership.MemberImpl;
import org.apache.catalina.tribes.membership.Membership;
+import org.apache.catalina.tribes.membership.StaticMember;
/**
* pTitle: A perfect failure detector /p
@@ -157,6 +158,9 @@ public class TcpFailureDetector extends
//not correct, we need to maintain the map
membership.removeMember( (MemberImpl) member);
removeSuspects.remove(member);
+if (member instanceof StaticMember) {
+addSuspects.put(member,
Long.valueOf(System.currentTimeMillis()));
+}
notify = true;
} else {
//add the member as suspect
@@ -228,6 +232,9 @@ public class TcpFailureDetector extends
if (membership.getMember(members[i])!=null) {
membership.removeMember((MemberImpl)members[i]);
removeSuspects.remove(members[i]);
+if (members[i] instanceof StaticMember) {
+addSuspects.put(members[i],
Long.valueOf(System.currentTimeMillis()));
+}
super.memberDisappeared(members[i]);
}
} //end if
@@ -239,6 +246,10 @@ public class TcpFailureDetector extends
//update all alive times
Member[] members = super.getMembers();
for (int i = 0; members != null i members.length; i++) {
+if (addSuspects.containsKey(members[i])
membership.getMember(members[i]) == null) {
+// avoid temporary adding member.
+continue;
+}
if (membership.memberAlive( (MemberImpl) members[i])) {
//we don't have this one in our membership, check to see if
he/she is alive
if (memberAlive(members[i])) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1402110 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java webapps/docs/changelog.xml
Author: kfujino
Date: Thu Oct 25 11:54:21 2012
New Revision: 1402110
URL: http://svn.apache.org/viewvc?rev=1402110view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54045.
Make sure getMembers() returns available member when TcpFailureDetector works
in static cluster.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=1402110r1=1402109r2=1402110view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Thu Oct 25 11:54:21 2012
@@ -36,6 +36,7 @@ import org.apache.catalina.tribes.io.Cha
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.tribes.membership.MemberImpl;
import org.apache.catalina.tribes.membership.Membership;
+import org.apache.catalina.tribes.membership.StaticMember;
/**
* pTitle: A perfect failure detector /p
@@ -157,6 +158,9 @@ public class TcpFailureDetector extends
//not correct, we need to maintain the map
membership.removeMember( (MemberImpl) member);
removeSuspects.remove(member);
+if (member instanceof StaticMember) {
+addSuspects.put(member,
Long.valueOf(System.currentTimeMillis()));
+}
notify = true;
} else {
//add the member as suspect
@@ -228,6 +232,9 @@ public class TcpFailureDetector extends
if (membership.getMember(members[i])!=null) {
membership.removeMember((MemberImpl)members[i]);
removeSuspects.remove(members[i]);
+if (members[i] instanceof StaticMember) {
+addSuspects.put(members[i],
Long.valueOf(System.currentTimeMillis()));
+}
super.memberDisappeared(members[i]);
}
} //end if
@@ -239,6 +246,10 @@ public class TcpFailureDetector extends
//update all alive times
Member[] members = super.getMembers();
for (int i = 0; members != null i members.length; i++) {
+if (addSuspects.containsKey(members[i])
membership.getMember(members[i]) == null) {
+// avoid temporary adding member.
+continue;
+}
if (membership.memberAlive( (MemberImpl) members[i])) {
//we don't have this one in our membership, check to see if
he/she is alive
if (memberAlive(members[i])) {
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=1402110r1=1402109r2=1402110view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 25 11:54:21 2012
@@ -102,6 +102,14 @@
/fix
/changelog
/subsection
+ subsection name=Tribes
+changelog
+ fix
+bug54045/bug: Make sure getMembers() returns available member when
+TcpFailureDetector works in static cluster. (kfujino)
+ /fix
+/changelog
+ /subsection
/section
section name=Tomcat 7.0.32 (markt) rtext=2012-10-09
subsection name=Catalina
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1402113 - in /tomcat/trunk/java/org/apache/jasper: compiler/Compiler.java compiler/PageInfo.java compiler/TagPluginManager.java compiler/tagplugin/TagPluginContext.java tagplugins/jstl/co
Author: markt
Date: Thu Oct 25 11:57:13 2012
New Revision: 1402113
URL: http://svn.apache.org/viewvc?rev=1402113view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54012
Enable the tag plug-in for c:set to work in tag files.
Based on a patch by Sheldon Shao.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java
tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1402113r1=1402112r2=1402113view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Thu Oct 25
11:57:13 2012
@@ -108,7 +108,7 @@ public abstract class Compiler {
// Setup page info area
pageInfo = new PageInfo(new BeanRepository(ctxt.getClassLoader(),
-errDispatcher), ctxt.getJspFile());
+errDispatcher), ctxt.getJspFile(), ctxt.isTagFile());
JspConfig jspConfig = options.getJspConfig();
JspConfig.JspProperty jspProperty = jspConfig.findJspProperty(ctxt
Modified: tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java?rev=1402113r1=1402112r2=1402113view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java Thu Oct 25
11:57:13 2012
@@ -99,8 +99,10 @@ class PageInfo {
// JSP 2.2
private boolean errorOnUndeclaredNamepsace = false;
-PageInfo(BeanRepository beanRepository, String jspFile) {
+private boolean isTagFile = false;
+PageInfo(BeanRepository beanRepository, String jspFile, boolean isTagFile)
{
+this.isTagFile = isTagFile;
this.jspFile = jspFile;
this.beanRepository = beanRepository;
this.varInfoNames = new HashSet();
@@ -119,6 +121,10 @@ class PageInfo {
imports.addAll(Constants.STANDARD_IMPORTS);
}
+public boolean isTagFile() {
+return isTagFile;
+}
+
/**
* Check if the plugin ID has been previously declared. Make a not
* that this Id is now declared.
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java?rev=1402113r1=1402112r2=1402113view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java Thu Oct
25 11:57:13 2012
@@ -243,6 +243,11 @@ public class TagPluginManager {
curNodes = node.getAtETag();
}
+@Override
+public boolean isTagFile() {
+return pageInfo.isTagFile();
+}
+
private Node.JspAttribute getNodeAttribute(String attribute) {
Node.JspAttribute[] attrs = node.getJspAttributes();
for (int i=0; attrs != null i attrs.length; i++) {
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java?rev=1402113r1=1402112r2=1402113view=diff
==
---
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
(original)
+++
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
Thu Oct 25 11:57:13 2012
@@ -120,5 +120,10 @@ public interface TagPluginContext {
* Get the value of an attribute in the current tagplugin context.
*/
Object getPluginAttribute(String attr);
+
+/**
+ * Is the tag being used inside a tag file?
+ */
+boolean isTagFile();
}
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java?rev=1402113r1=1402112r2=1402113view=diff
==
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java (original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java Thu Oct
25 11:57:13 2012
@@ -70,14 +70,20 @@ public class Set implements TagPlugin {
//if the attribute var has been specified
svn commit: r1402115 - in /tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core: AbstractTestTag.java TestOut.java TestSet.java
Author: markt
Date: Thu Oct 25 11:58:00 2012
New Revision: 1402115
URL: http://svn.apache.org/viewvc?rev=1402115view=rev
Log:
Enable test case for BZ54012 and refactor common code to base class.
Added:
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java
Modified:
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
Added:
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java?rev=1402115view=auto
==
---
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java
(added)
+++
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java
Thu Oct 25 11:58:00 2012
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jasper.tagplugins.jstl.core;
+
+import java.io.File;
+
+import org.junit.Before;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.WebResourceRoot;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.webresources.StandardRoot;
+
+public abstract class AbstractTestTag extends TomcatBaseTest {
+
+@Before
+public void setup() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp-3.0);
+Context ctx = tomcat.addWebapp(null, /test,
appDir.getAbsolutePath());
+
+ctx.setResources(new StandardRoot(ctx));
+
+// Add the JSTL (we need the TLD)
+File lib = new File(webapps/examples/WEB-INF/lib);
+ctx.getResources().createWebResourceSet(
+WebResourceRoot.ResourceSetType.POST, lib.getAbsolutePath(),
+/WEB-INF/lib, );
+
+// Configure the use of the plug-in rather than the standard impl
+File plugin = new File(
+java/org/apache/jasper/tagplugins/jstl/tagPlugins.xml);
+ctx.getResources().createWebResourceSet(
+WebResourceRoot.ResourceSetType.POST, plugin.getAbsolutePath(),
+/WEB-INF/tagPlugins.xml, );
+
+tomcat.start();
+}
+}
Modified: tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java?rev=1402115r1=1402114r2=1402115view=diff
==
--- tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java Thu
Oct 25 11:58:00 2012
@@ -16,46 +16,17 @@
*/
package org.apache.jasper.tagplugins.jstl.core;
-import java.io.File;
-
import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.catalina.Context;
-import org.apache.catalina.WebResourceRoot;
-import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.catalina.webresources.StandardRoot;
import org.apache.tomcat.util.buf.ByteChunk;
-public class TestOut extends TomcatBaseTest {
+public class TestOut extends AbstractTestTag {
@Test
public void testBug54011() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File(test/webapp-3.0);
-Context ctx = tomcat.addWebapp(null, /test,
appDir.getAbsolutePath());
-
-ctx.setResources(new StandardRoot(ctx));
-
-// Add the JSTL (we need the TLD)
-File lib = new File(webapps/examples/WEB-INF/lib);
-ctx.getResources().createWebResourceSet(
-WebResourceRoot.ResourceSetType.POST, lib.getAbsolutePath(),
-/WEB-INF/lib, );
-
-// Configure the use of the plug-in rather than the standard impl
-File plugin = new File(
-java/org/apache/jasper/tagplugins/jstl/tagPlugins.xml);
-ctx.getResources().createWebResourceSet(
svn commit: r1402117 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Thu Oct 25 11:58:38 2012 New Revision: 1402117 URL: http://svn.apache.org/viewvc?rev=1402117view=rev Log: Proposal. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1402117r1=1402116r2=1402117view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 25 11:58:38 2012 @@ -72,6 +72,13 @@ PATCHES PROPOSED TO BACKPORT: +1: markt -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54045. + Make sure getMembers() returns available member when TcpFailureDetector works + in static cluster. + http://svn.apache.org/viewvc?view=revisionrevision=1402110 + +1: kfujino + -1: + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54045] ReplicatedMap don't like TcpFailureDetector in static configuration
https://issues.apache.org/bugzilla/show_bug.cgi?id=54045 Keiichi Fujino kfuj...@apache.org changed: What|Removed |Added OS||All --- Comment #1 from Keiichi Fujino kfuj...@apache.org --- Thanks for the report. Fixed in trunk and 7.0.x and will be included in 7.0.33 onwards. Proposed for 6.0.x. -- 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 54045] ReplicatedMap don't like TcpFailureDetector in static configuration
https://issues.apache.org/bugzilla/show_bug.cgi?id=54045 Keiichi Fujino kfuj...@apache.org changed: What|Removed |Added Component|Cluster |Cluster Version|7.0.32 |6.0.36 Product|Tomcat 7|Tomcat 6 Target Milestone|--- |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 54012] No pageContext in tag files' generated java code when using code generation by JSTL tagplugin Set
https://issues.apache.org/bugzilla/show_bug.cgi?id=54012 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #6 from Mark Thomas ma...@apache.org --- Thanks for the patch. I applied a slightly modified version to trunk and 7.0.x. I also added a test case to trunk. The fix will be in 7.0.33 onwards. -- 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: r1402119 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ java/org/apache/jasper/compiler/ java/org/apache/jasper/compiler/tagplugin/ java/org/apache/jasper/tagplugins/jstl
Author: markt
Date: Thu Oct 25 12:07:07 2012
New Revision: 1402119
URL: http://svn.apache.org/viewvc?rev=1402119view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54012
Enable the tag plug-in for c:set to work in tag files.
Based on a patch by Sheldon Shao.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1402113
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=1402119r1=1402118r2=1402119view=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
Thu Oct 25 12:07:07 2012
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the License); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -114,7 +114,7 @@ import org.xml.sax.SAXParseException;
public class ContextConfig implements LifecycleListener {
private static final Log log = LogFactory.getLog( ContextConfig.class );
-
+
private static final String SCI_LOCATION =
META-INF/services/javax.servlet.ServletContainerInitializer;
@@ -129,7 +129,7 @@ public class ContextConfig implements Li
protected static final LoginConfig DUMMY_LOGIN_CONFIG =
new LoginConfig(NONE, null, null, null);
-
+
/**
* The set of Authenticators that we know how to configure. The key is
@@ -210,14 +210,14 @@ public class ContextConfig implements Li
*/
@Deprecated
protected String defaultContextXml = null;
-
-
+
+
/**
* The default web application's deployment descriptor location.
*/
protected String defaultWebXml = null;
-
-
+
+
/**
* Track any fatal errors during startup configuration processing.
*/
@@ -228,14 +228,14 @@ public class ContextConfig implements Li
* Original docBase.
*/
protected String originalDocBase = null;
-
+
/**
* Map of ServletContainerInitializer to classes they expressed interest
in.
*/
protected final MapServletContainerInitializer, SetClass?
initializerClassMap =
new LinkedHashMapServletContainerInitializer, SetClass?();
-
+
/**
* Map of Types to ServletContainerInitializer that are interested in those
* types.
@@ -277,7 +277,7 @@ public class ContextConfig implements Li
protected Digester webFragmentDigester = null;
protected WebRuleSet webFragmentRuleSet = null;
-
+
// - Properties
/**
* Return the location of the default deployment descriptor
@@ -399,11 +399,11 @@ public class ContextConfig implements Li
* Process the application classes annotations, if it exists.
*/
protected void applicationAnnotationsConfig() {
-
+
long t1=System.currentTimeMillis();
-
+
WebAnnotationSet.loadApplicationAnnotations(context);
-
+
long t2=System.currentTimeMillis();
if (context instanceof StandardContext) {
((StandardContext) context).setStartupTime(t2-t1+
@@ -438,7 +438,7 @@ public class ContextConfig implements Li
// Has an authenticator been configured already?
if (context.getAuthenticator() != null)
return;
-
+
if (!(context instanceof ContainerBase)) {
return; // Cannot install a Valve even if it would be needed
}
@@ -513,19 +513,19 @@ public class ContextConfig implements Li
*/
public void createWebXmlDigester(boolean namespaceAware,
boolean validation) {
-
+
webRuleSet = new WebRuleSet(false);
webDigester = DigesterFactory.newDigester(validation,
svn commit: r1402122 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Author: markt
Date: Thu Oct 25 12:14:09 2012
New Revision: 1402122
URL: http://svn.apache.org/viewvc?rev=1402122view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54017
Simplify and reduce GC.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1402122r1=1402121r2=1402122view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Thu Oct 25
12:14:09 2012
@@ -3174,7 +3174,7 @@ class Generator {
} else if (c == Long.class) {
return JspUtil.coerceToLong(s, isNamedAttribute);
} else if (c == Object.class) {
-return new String( + quoted + );
+return quoted;
} else {
String className = c.getCanonicalName();
return (
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1402123 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml
Author: markt
Date: Thu Oct 25 12:16:22 2012
New Revision: 1402123
URL: http://svn.apache.org/viewvc?rev=1402123view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54017
Simplify and reduce GC.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1402122
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1402123r1=1402122r2=1402123view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Thu Oct
25 12:16:22 2012
@@ -3176,7 +3176,7 @@ class Generator {
} else if (c == Long.class) {
return JspUtil.coerceToLong(s, isNamedAttribute);
} else if (c == Object.class) {
-return new String( + quoted + );
+return quoted;
} else {
String className = c.getCanonicalName();
return (
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=1402123r1=1402122r2=1402123view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 25 12:16:22 2012
@@ -97,6 +97,10 @@
the codelt;c:setgt;/code triggered a JSP compilation error when
used in a tag file. Based on a patch provided by Sheldon Shao. (markt)
/fix
+ scode
+bug54017/bug: Simplify coercion of codeString/code instances to
+codeObject/code. (markt)
+ /scode
/changelog
/subsection
subsection name=Cluster
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54017] new String instance is generated for constant string in Generator.convertString
https://issues.apache.org/bugzilla/show_bug.cgi?id=54017 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- Yes, that makes sense since String is an instance of an Object there is no need to create a new String. Fixed for 7.0.x and trunk and will be included in 7.0.33 onwards. -- 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 54019] org.apache.coyote.Response org.apache.coyote.Request don't call recycle() on notes[] elements.
https://issues.apache.org/bugzilla/show_bug.cgi?id=54019 Mark Thomas ma...@apache.org changed: What|Removed |Added Severity|critical|normal --- Comment #2 from Mark Thomas ma...@apache.org --- Without a reproducible test case, this will eventually get resolved as invalid on the assumption that the root cause is an application bug (there are plenty of ways to trigger this sort of issue by retaining references across requests). Based on the lack of response to my previous request for information, I am reducing the severity to normal. If this really was critical then I'd expect a faster response than 1 week+. -- 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 54019] org.apache.coyote.Response org.apache.coyote.Request don't call recycle() on notes[] elements.
https://issues.apache.org/bugzilla/show_bug.cgi?id=54019 --- Comment #3 from F.Arnoud frederic.arn...@gmail.com --- I tried to extract the scheme of main application in a shorter test case. But I cannot reproduce it. 1) For the buffer violation: I can reproduce it but only if I don't respect the contract (using the buffer after END/ERROR or after an IOException, it's a bug in the web application). 2) For the request attribute: I cannot reproduce it, but in the customer application this attribute is set only while processing the BEGIN event. And sometimes, this attribute contains a previous setted value! For case 1 or 2, even if it's a web application error, maybe Tomcat must protect his buffer and attribute while it recycles object. I don't know the philosophy, but IMHO something could be wrong here. A solution, as an option, could be to wrap the servlet request and response and disconnect it totally from background elements since application could use it later. I talk about an option because this need to create new wrappers. But without such wrapper, there's a problem with the recycling in a shared server. I thought it was critical to be able to do this. Personnaly I fixed this in my application with wrapper, anywhere an error occurs I can completely separate running thread from the real tomcat objects. In this application we have a lot of connections, some could be closed while/before processing the begin event! regards, fred -- 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 54019] org.apache.coyote.Response org.apache.coyote.Request don't call recycle() on notes[] elements.
https://issues.apache.org/bugzilla/show_bug.cgi?id=54019 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INVALID --- Comment #4 from Mark Thomas ma...@apache.org --- The option already exists. Try with starting Tomcat with -Dorg.apache.catalina.connector.RECYCLE_FACADES=true See http://tomcat.apache.org/tomcat-7.0-doc/config/systemprops.html#Security Given that the issue went away with a wrapper, that strongly suggests an application error so I am closing this as invalid. If you find evidence that points to a Tomcat bug feel free to re-open this. -- 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: r1402345 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Author: markt
Date: Thu Oct 25 22:12:33 2012
New Revision: 1402345
URL: http://svn.apache.org/viewvc?rev=1402345view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54022
Ensure Comet END event is triggered on client disconnect with APR/native on
Windows Vista/2k8 or later.
Patch provided by Douglas Beachy.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1402345r1=1402344r2=1402345view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Oct 25
22:12:33 2012
@@ -604,9 +604,13 @@ public abstract class AbstractProtocol i
SocketState state = SocketState.CLOSED;
do {
-if (status == SocketStatus.DISCONNECT) {
-//do nothing here, just wait for it to get recycled
-} else if (processor.isAsync() || state ==
SocketState.ASYNC_END) {
+if (status == SocketStatus.DISCONNECT
+!processor.isComet()) {
+// Do nothing here, just wait for it to get recycled
+// Don't do this for Comet we need to generate an end
+// event (see BZ 54022)
+} else if (processor.isAsync() ||
+state == SocketState.ASYNC_END) {
state = processor.asyncDispatch(status);
} else if (processor.isComet()) {
state = processor.event(status);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1402346 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/AbstractProtocol.java webapps/docs/changelog.xml
Author: markt
Date: Thu Oct 25 22:14:29 2012
New Revision: 1402346
URL: http://svn.apache.org/viewvc?rev=1402346view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54022
Ensure Comet END event is triggered on client disconnect with APR/native on
Windows Vista/2k8 or later.
Patch provided by Douglas Beachy.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1402345
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1402346r1=1402345r2=1402346view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Oct
25 22:14:29 2012
@@ -573,9 +573,13 @@ public abstract class AbstractProtocol i
SocketState state = SocketState.CLOSED;
do {
-if (status == SocketStatus.DISCONNECT) {
-//do nothing here, just wait for it to get recycled
-} else if (processor.isAsync() || state ==
SocketState.ASYNC_END) {
+if (status == SocketStatus.DISCONNECT
+!processor.isComet()) {
+// Do nothing here, just wait for it to get recycled
+// Don't do this for Comet we need to generate an end
+// event (see BZ 54022)
+} else if (processor.isAsync() ||
+state == SocketState.ASYNC_END) {
state = processor.asyncDispatch(status);
} else if (processor.isComet()) {
state = processor.event(status);
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=1402346r1=1402345r2=1402346view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 25 22:14:29 2012
@@ -72,6 +72,11 @@
Correct an issue that prevented WebSockets from being used over SSL
when
using the HTTP NIO connector. (markt)
/fix
+ fix
+ bug54022/bug: Ensure the Comet END event is triggered on client
+ disconnect with APR/native on Windows Vista/2k8 or later. Patch provided
+ by Douglas Beachy. (markt)
+ /fix
/changelog
/subsection
subsection name=Jasper
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54022] CometEvent.END event is not sent on a suspended socket disconnect when running with Tomcat Native (tcnative-1.dll) on Windows Vista / Windows Server 2008 or newer.
https://issues.apache.org/bugzilla/show_bug.cgi?id=54022 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- Many thanks for the detailed analysis. One day, all bug reports will be this easy to work with. The Tomcat developers really appreciate it when folks put this sort of effort into their bug report as it saves us a lot of time. Fixed in trunk and 7.0.x and will be included in 7.0.33 onwards. -- 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 54025] Issue with file returning -1 time just as in bug 53257
https://issues.apache.org/bugzilla/show_bug.cgi?id=54025 --- Comment #1 from Mark Thomas ma...@apache.org --- No need to apologise. You did exactly the right thing. I have added some test cases locally and I do see this failure. I am investigating now. -- 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: r1402348 - in /tomcat/trunk/test: org/apache/jasper/compiler/ webapp-3.0/bug53257/ webapp-3.0/bug53257/foo bar/
Author: markt
Date: Thu Oct 25 22:38:36 2012
New Revision: 1402348
URL: http://svn.apache.org/viewvc?rev=1402348view=rev
Log:
Expand test cases to cover BZ54025
Added:
tomcat/trunk/test/webapp-3.0/bug53257/foo bar/
tomcat/trunk/test/webapp-3.0/bug53257/foo bar.jsp (with props)
tomcat/trunk/test/webapp-3.0/bug53257/foo bar.txt (with props)
tomcat/trunk/test/webapp-3.0/bug53257/foo bar/foobar.jsp (with props)
tomcat/trunk/test/webapp-3.0/bug53257/foo bar/foobar.txt (with props)
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
tomcat/trunk/test/webapp-3.0/bug53257/index.jsp
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1402348r1=1402347r2=1402348view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java Thu Oct 25
22:38:36 2012
@@ -168,6 +168,38 @@ public class TestCompiler extends Tomcat
tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
tomcat.start();
+ByteChunk res = getUrl(http://localhost:; + getPort() +
+/test/bug53257/foo%20bar.jsp);
+
+// Check request completed
+String result = res.toString();
+assertEcho(result, OK);
+}
+
+@Test
+public void testBug53257g() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp-3.0);
+tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
+tomcat.start();
+
+ByteChunk res = getUrl(http://localhost:; + getPort() +
+/test/bug53257/foo%20bar/foobar.jsp);
+
+// Check request completed
+String result = res.toString();
+assertEcho(result, OK);
+}
+
+@Test
+public void testBug53257z() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp-3.0);
+tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
+tomcat.start();
+
// Check that URL decoding is not done twice
ByteChunk res = new ByteChunk();
int rc = getUrl(http://localhost:; + getPort() +
Added: tomcat/trunk/test/webapp-3.0/bug53257/foo bar.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug53257/foo%20bar.jsp?rev=1402348view=auto
==
--- tomcat/trunk/test/webapp-3.0/bug53257/foo bar.jsp (added)
+++ tomcat/trunk/test/webapp-3.0/bug53257/foo bar.jsp Thu Oct 25 22:38:36 2012
@@ -0,0 +1,21 @@
+%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the License); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--%
+html
+ body
+pOK/p
+ /body
+/html
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp-3.0/bug53257/foo bar.jsp
--
svn:eol-style = native
Added: tomcat/trunk/test/webapp-3.0/bug53257/foo bar.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug53257/foo%20bar.txt?rev=1402348view=auto
==
--- tomcat/trunk/test/webapp-3.0/bug53257/foo bar.txt (added)
+++ tomcat/trunk/test/webapp-3.0/bug53257/foo bar.txt Thu Oct 25 22:38:36 2012
@@ -0,0 +1 @@
+OK
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp-3.0/bug53257/foo bar.txt
--
svn:eol-style = native
Added: tomcat/trunk/test/webapp-3.0/bug53257/foo bar/foobar.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug53257/foo%20bar/foobar.jsp?rev=1402348view=auto
==
--- tomcat/trunk/test/webapp-3.0/bug53257/foo bar/foobar.jsp (added)
+++ tomcat/trunk/test/webapp-3.0/bug53257/foo bar/foobar.jsp Thu Oct 25
22:38:36 2012
@@ -0,0 +1,21 @@
+%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file
[Bug 54025] Issue with file returning -1 time just as in bug 53257
https://issues.apache.org/bugzilla/show_bug.cgi?id=54025 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #2 from Mark Thomas ma...@apache.org --- OK. The reason I could see the failure was that my test cases were broken. I have corrected the test cases and am now unable to repeat the issue described. I have added the test cases to trunk and 7.0.x. I recommend that you follow this up in the Tomcat users mailing list as configuration error is the most likely cause at this point. If that discussion identifies a bug then feel free to re-open this issue but you'll need to attach a test case that demonstrates the issue. -- 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: r1402349 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/jasper/compiler/TestCompiler.java test/webapp-3.0/bug53257/foo bar.jsp test/webapp-3.0/bug53257/foo bar.txt test/webapp-3.0/bug53257
Author: markt
Date: Thu Oct 25 22:41:03 2012
New Revision: 1402349
URL: http://svn.apache.org/viewvc?rev=1402349view=rev
Log:
Expand test cases to cover BZ54025
Added:
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/foo bar/
- copied from r1402348, tomcat/trunk/test/webapp-3.0/bug53257/foo bar/
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/foo bar.jsp
- copied unchanged from r1402348,
tomcat/trunk/test/webapp-3.0/bug53257/foo bar.jsp
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/foo bar.txt
- copied unchanged from r1402348,
tomcat/trunk/test/webapp-3.0/bug53257/foo bar.txt
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1402348
Modified: tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1402349r1=1402348r2=1402349view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java Thu
Oct 25 22:41:03 2012
@@ -168,6 +168,38 @@ public class TestCompiler extends Tomcat
tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
tomcat.start();
+ByteChunk res = getUrl(http://localhost:; + getPort() +
+/test/bug53257/foo%20bar.jsp);
+
+// Check request completed
+String result = res.toString();
+assertEcho(result, OK);
+}
+
+@Test
+public void testBug53257g() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp-3.0);
+tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
+tomcat.start();
+
+ByteChunk res = getUrl(http://localhost:; + getPort() +
+/test/bug53257/foo%20bar/foobar.jsp);
+
+// Check request completed
+String result = res.toString();
+assertEcho(result, OK);
+}
+
+@Test
+public void testBug53257z() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp-3.0);
+tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
+tomcat.start();
+
// Check that URL decoding is not done twice
ByteChunk res = new ByteChunk();
int rc = getUrl(http://localhost:; + getPort() +
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp?rev=1402349r1=1402348r2=1402349view=diff
==
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp Thu Oct 25 22:41:03
2012
@@ -17,7 +17,8 @@
%@page contentType=text/plain; charset=UTF-8
%%@page import=java.net.URL,java.net.URLConnection%%
String[] testFiles = new String[] {foo;bar.txt, foobar.txt,
-foo#bar.txt, foo%bar.txt, foo+bar.txt};
+foo#bar.txt, foo%bar.txt, foo+bar.txt, foo bar.txt,
+foo bar/foobar.txt};
for (String testFile : testFiles) {
URL url = application.getResource(/bug53257/ + testFile);
if (url == null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1402350 - /tomcat/trunk/conf/web.xml
Author: markt Date: Thu Oct 25 23:02:01 2012 New Revision: 1402350 URL: http://svn.apache.org/viewvc?rev=1402350view=rev Log: MIME types update: sync with Apache webserver mime.types file using res/scripts/check-mime.pl. Modified: tomcat/trunk/conf/web.xml Modified: tomcat/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1402350r1=1402349r2=1402350view=diff == --- tomcat/trunk/conf/web.xml (original) +++ tomcat/trunk/conf/web.xml Thu Oct 25 23:02:01 2012 @@ -527,6 +527,10 @@ mime-typetext/vnd.in3d.3dml/mime-type /mime-mapping mime-mapping +extension3ds/extension +mime-typeimage/x-3ds/mime-type +/mime-mapping +mime-mapping extension3g2/extension mime-typevideo/3gpp2/mime-type /mime-mapping @@ -643,6 +647,10 @@ mime-typeapplication/vnd.android.package-archive/mime-type /mime-mapping mime-mapping +extensionappcache/extension +mime-typetext/cache-manifest/mime-type +/mime-mapping +mime-mapping extensionapplication/extension mime-typeapplication/x-ms-application/mime-type /mime-mapping @@ -651,6 +659,10 @@ mime-typeapplication/vnd.lotus-approach/mime-type /mime-mapping mime-mapping +extensionarc/extension +mime-typeapplication/x-freearc/mime-type +/mime-mapping +mime-mapping extensionart/extension mime-typeimage/x-jg/mime-type /mime-mapping @@ -759,6 +771,14 @@ mime-typeapplication/octet-stream/mime-type /mime-mapping mime-mapping +extensionblb/extension +mime-typeapplication/x-blorb/mime-type +/mime-mapping +mime-mapping +extensionblorb/extension +mime-typeapplication/x-blorb/mime-type +/mime-mapping +mime-mapping extensionbmi/extension mime-typeapplication/vnd.bmi/mime-type /mime-mapping @@ -835,6 +855,10 @@ mime-typeapplication/vnd.ms-cab-compressed/mime-type /mime-mapping mime-mapping +extensioncaf/extension +mime-typeaudio/x-caf/mime-type +/mime-mapping +mime-mapping extensioncap/extension mime-typeapplication/vnd.tcpdump.pcap/mime-type /mime-mapping @@ -847,6 +871,26 @@ mime-typeapplication/vnd.ms-pki.seccat/mime-type /mime-mapping mime-mapping +extensioncb7/extension +mime-typeapplication/x-cbr/mime-type +/mime-mapping +mime-mapping +extensioncba/extension +mime-typeapplication/x-cbr/mime-type +/mime-mapping +mime-mapping +extensioncbr/extension +mime-typeapplication/x-cbr/mime-type +/mime-mapping +mime-mapping +extensioncbt/extension +mime-typeapplication/x-cbr/mime-type +/mime-mapping +mime-mapping +extensioncbz/extension +mime-typeapplication/x-cbr/mime-type +/mime-mapping +mime-mapping extensioncc/extension mime-typetext/x-c/mime-type /mime-mapping @@ -907,6 +951,10 @@ mime-typeapplication/pkix-cert/mime-type /mime-mapping mime-mapping +extensioncfs/extension +mime-typeapplication/x-cfs-compressed/mime-type +/mime-mapping +mime-mapping extensioncgm/extension mime-typeimage/cgm/mime-type /mime-mapping @@ -1079,6 +1127,10 @@ mime-typeapplication/vnd.mobius.daf/mime-type /mime-mapping mime-mapping +extensiondart/extension +mime-typeapplication/vnd.dart/mime-type +/mime-mapping +mime-mapping extensiondataless/extension mime-typeapplication/vnd.fdsn.seed/mime-type /mime-mapping @@ -1087,6 +1139,10 @@ mime-typeapplication/davmount+xml/mime-type /mime-mapping mime-mapping +extensiondbk/extension +mime-typeapplication/docbook+xml/mime-type +/mime-mapping +mime-mapping extensiondcr/extension mime-typeapplication/x-director/mime-type /mime-mapping @@ -1123,6 +1179,10 @@ mime-typeapplication/vnd.dreamfactory/mime-type /mime-mapping mime-mapping +extensiondgc/extension +mime-typeapplication/x-dgc-compressed/mime-type +/mime-mapping +mime-mapping extensiondib/extension mime-typeimage/bmp/mime-type /mime-mapping @@ -1160,7 +1220,7 @@ /mime-mapping mime-mapping extensiondmg/extension -mime-typeapplication/octet-stream/mime-type +mime-typeapplication/x-apple-diskimage/mime-type /mime-mapping mime-mapping extensiondmp/extension @@ -1307,6 +1367,10 @@ mime-typeapplication/octet-stream/mime-type /mime-mapping mime-mapping +extensionemf/extension +mime-typeapplication/x-msmetafile/mime-type +/mime-mapping +mime-mapping
svn commit: r1402351 - in /tomcat/tc7.0.x/trunk: ./ conf/web.xml webapps/docs/changelog.xml
Author: markt Date: Thu Oct 25 23:04:04 2012 New Revision: 1402351 URL: http://svn.apache.org/viewvc?rev=1402351view=rev Log: MIME types update: sync with Apache webserver mime.types file using res/scripts/check-mime.pl. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/conf/web.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1402350 Modified: tomcat/tc7.0.x/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/web.xml?rev=1402351r1=1402350r2=1402351view=diff == --- tomcat/tc7.0.x/trunk/conf/web.xml (original) +++ tomcat/tc7.0.x/trunk/conf/web.xml Thu Oct 25 23:04:04 2012 @@ -526,6 +526,10 @@ mime-typetext/vnd.in3d.3dml/mime-type /mime-mapping mime-mapping +extension3ds/extension +mime-typeimage/x-3ds/mime-type +/mime-mapping +mime-mapping extension3g2/extension mime-typevideo/3gpp2/mime-type /mime-mapping @@ -642,6 +646,10 @@ mime-typeapplication/vnd.android.package-archive/mime-type /mime-mapping mime-mapping +extensionappcache/extension +mime-typetext/cache-manifest/mime-type +/mime-mapping +mime-mapping extensionapplication/extension mime-typeapplication/x-ms-application/mime-type /mime-mapping @@ -650,6 +658,10 @@ mime-typeapplication/vnd.lotus-approach/mime-type /mime-mapping mime-mapping +extensionarc/extension +mime-typeapplication/x-freearc/mime-type +/mime-mapping +mime-mapping extensionart/extension mime-typeimage/x-jg/mime-type /mime-mapping @@ -758,6 +770,14 @@ mime-typeapplication/octet-stream/mime-type /mime-mapping mime-mapping +extensionblb/extension +mime-typeapplication/x-blorb/mime-type +/mime-mapping +mime-mapping +extensionblorb/extension +mime-typeapplication/x-blorb/mime-type +/mime-mapping +mime-mapping extensionbmi/extension mime-typeapplication/vnd.bmi/mime-type /mime-mapping @@ -834,6 +854,10 @@ mime-typeapplication/vnd.ms-cab-compressed/mime-type /mime-mapping mime-mapping +extensioncaf/extension +mime-typeaudio/x-caf/mime-type +/mime-mapping +mime-mapping extensioncap/extension mime-typeapplication/vnd.tcpdump.pcap/mime-type /mime-mapping @@ -846,6 +870,26 @@ mime-typeapplication/vnd.ms-pki.seccat/mime-type /mime-mapping mime-mapping +extensioncb7/extension +mime-typeapplication/x-cbr/mime-type +/mime-mapping +mime-mapping +extensioncba/extension +mime-typeapplication/x-cbr/mime-type +/mime-mapping +mime-mapping +extensioncbr/extension +mime-typeapplication/x-cbr/mime-type +/mime-mapping +mime-mapping +extensioncbt/extension +mime-typeapplication/x-cbr/mime-type +/mime-mapping +mime-mapping +extensioncbz/extension +mime-typeapplication/x-cbr/mime-type +/mime-mapping +mime-mapping extensioncc/extension mime-typetext/x-c/mime-type /mime-mapping @@ -906,6 +950,10 @@ mime-typeapplication/pkix-cert/mime-type /mime-mapping mime-mapping +extensioncfs/extension +mime-typeapplication/x-cfs-compressed/mime-type +/mime-mapping +mime-mapping extensioncgm/extension mime-typeimage/cgm/mime-type /mime-mapping @@ -1078,6 +1126,10 @@ mime-typeapplication/vnd.mobius.daf/mime-type /mime-mapping mime-mapping +extensiondart/extension +mime-typeapplication/vnd.dart/mime-type +/mime-mapping +mime-mapping extensiondataless/extension mime-typeapplication/vnd.fdsn.seed/mime-type /mime-mapping @@ -1086,6 +1138,10 @@ mime-typeapplication/davmount+xml/mime-type /mime-mapping mime-mapping +extensiondbk/extension +mime-typeapplication/docbook+xml/mime-type +/mime-mapping +mime-mapping extensiondcr/extension mime-typeapplication/x-director/mime-type /mime-mapping @@ -1122,6 +1178,10 @@ mime-typeapplication/vnd.dreamfactory/mime-type /mime-mapping mime-mapping +extensiondgc/extension +mime-typeapplication/x-dgc-compressed/mime-type +/mime-mapping +mime-mapping extensiondib/extension mime-typeimage/bmp/mime-type /mime-mapping @@ -1159,7 +1219,7 @@ /mime-mapping mime-mapping extensiondmg/extension -mime-typeapplication/octet-stream/mime-type +mime-typeapplication/x-apple-diskimage/mime-type /mime-mapping mime-mapping
[Bug 54028] Please add mime mapping for html5 manifest
https://issues.apache.org/bugzilla/show_bug.cgi?id=54028 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- I have sync'd Tomcat with the list in httpd. That pulled in this and a bunch of new / updated types. The updated list has been applied to trunk and 7.0.x -- 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
[jira] [Created] (MTOMCAT-184) Entire web.xml is logged at level INFO
Dennis Homann created MTOMCAT-184:
-
Summary: Entire web.xml is logged at level INFO
Key: MTOMCAT-184
URL: https://issues.apache.org/jira/browse/MTOMCAT-184
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat7
Affects Versions: 2.0
Reporter: Dennis Homann
Assignee: Olivier Lamy (*$^¨%`£)
Priority: Minor
When running {{tomcat7:run}}, the entire merged web.xml will be logged at level
INFO. Since the merged web.xml can be very, very long and INFO is the default
log level, this completely clutters the Maven log output.
If even necessary, the web.xml should only be logged at level DEBUG.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/881 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1402351 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-validate-eoln (in module tomcat-trunk) 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-trunk-validate-eoln has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate-eoln : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/gump_work/build_tomcat-trunk_tomcat-trunk-validate-eoln.html Work Name: build_tomcat-trunk_tomcat-trunk-validate-eoln (Type: Build) Work ended in a state of : Failed Elapsed: 20 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml validate-eoln [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/classes:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/classes [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/bin [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/conf [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/lib [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/logs [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/webapps compile-prepare: [copy] Copying 1 file to /srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/startup [copy] Copying 1 file to /srv/gump/public/workspace/tomcat-trunk/webapps/docs validate-eoln: [javac] Compiling 1 source file to /srv/gump/public/workspace/tomcat-trunk/output/classes [checkeol] Checking line ends in 2305 file(s) [checkeol] Checking line ends in 85 file(s) [checkeol] Done line ends check in 2390 file(s), 1 error(s) found. [checkeol] The following files have wrong line ends: [ [checkeol] /srv/gump/public/workspace/tomcat-trunk/test/webapp-3.0/WEB-INF/tags/bug54012.tag: uses CRLF on line 1] BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:543: The following files have wrong line ends: [ /srv/gump/public/workspace/tomcat-trunk/test/webapp-3.0/WEB-INF/tags/bug54012.tag: uses CRLF on line 1] Total time: 20 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 1226102012, vmgump.apache.org:vmgump:1226102012 Gump E-mail Identifier (unique within run) #11. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-validate (in module tomcat-7.0.x) 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-tc7.0.x-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-validate : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 33 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-26102012.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-26102012.jar:/srv/gump/public/workspace/junit/dist/junit-26102012.jar:/srv/gump/ public/workspace/junit/dist/junit-dep-26102012.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-14.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-26102012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-26102012.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-26102012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-26102012-dep.jar - Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 5.7-SNAPSHOT on 2305 files [checkstyle] /srv/gump/public/workspace/tomcat-7.0.x/test/webapp-3.0/bug53257/foo bar/foobar.txt:1: Missing a header - not enough lines in file. BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:450: Got 1 errors and 0 warnings. Total time: 31 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 1226102012, vmgump.apache.org:vmgump:1226102012 Gump E-mail Identifier (unique within run) #43. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) 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-trunk-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 34 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-26102012.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-26102012.jar:/srv/gump/public/workspace/junit/dist/junit-26102012.jar:/srv/gump/ public/workspace/junit/dist/junit-dep-26102012.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-14.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-26102012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-26102012.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-26102012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-26102012-dep.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 5.7-SNAPSHOT on 2356 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/test/webapp-3.0/bug53257/foo bar/foobar.txt:1: Missing a header - not enough lines in file. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:469: Got 1 errors and 0 warnings. Total time: 33 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 1226102012, vmgump.apache.org:vmgump:1226102012 Gump E-mail Identifier (unique within run) #44. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail:
