Re: svn commit: r966882 - in /tomcat/trunk: build.properties.default build.xml checkstyle.xml webapps/docs/changelog.xml
On 24/07/2010 04:05, Bill Barker wrote: I'm -1 (vote, not veto) on having validate be a dependency for compile. Historically, Tomcat has been very lenient about what is required just to build the project, and I can't see the reason to force checkstyle just to be able to build. Mostly my concern is with Gump (which I can fix the metadata when svn comes up again). But that puts a transitive dependency on bcel that will get fixed who knows when. I'm more than happy to add a tomcat-trunk-validate project to Gump if it is split from compile. Having tried this (yes, I should have done this first), changing to -1 veto. In the OS world of cat herding, we should allow for the fact that somebody mistakenly violates the checkstyle rules and commits without building. It happens all the time, and then they go off to sleep and nobody else can build the project with a fresh checkout for hours. As I've said, I'm happy to add this to Gump (assuming that bcel ever builds ever again) if it a separate target to get regular automated notices. But developers can run a separate target themselves (just like test). I'll add a flag (defaults to off) that controls if the checkstyle target actually does anything. That'll give folks the option to enable it locally if they wish. We could do a similar thing with test too. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r978826 - in /tomcat/trunk: BUILDING.txt build.properties.default build.xml
Author: markt
Date: Sat Jul 24 08:37:48 2010
New Revision: 978826
URL: http://svn.apache.org/viewvc?rev=978826&view=rev
Log:
Update to require Ant 1.8.x+ to take advantage of the new property expansion
for if/unless and then use it control if the validate code is executed.
Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=978826&r1=978825&r2=978826&view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Sat Jul 24 08:37:48 2010
@@ -42,11 +42,11 @@ do the following:
into which you installed the JDK release.
-(1) Install Apache Ant 1.6.x on your computer
+(1) Install Apache Ant 1.8.x on your computer
-* If Apache Ant 1.6.x is already installed on your computer, skip to (2).
+* If Apache Ant 1.8.x is already installed on your computer, skip to (2).
-* Download a binary distribution of Ant 1.6.x from:
+* Download a binary distribution of Ant 1.8.x from:
http://ant.apache.org/bindownload.cgi
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=978826&r1=978825&r2=978826&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Sat Jul 24 08:37:48 2010
@@ -31,6 +31,9 @@ version.build=1
version.patch=0
version.suffix=-dev
+# - Build control flags -
+execute.validate=false
+
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
# as it is referenced with different working directory
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=978826&r1=978825&r2=978826&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sat Jul 24 08:37:48 2010
@@ -410,7 +410,7 @@
-
+
@@ -763,7 +763,8 @@
optimize="${compile.optimize}"
classpath="${tomcat.classes}"
excludes="**/CVS/**,**/.svn/**"
- encoding="ISO-8859-1">
+ encoding="ISO-8859-1"
+includeantruntime="false">
+ encoding="ISO-8859-1"
+includeantruntime="false">
@@ -931,7 +933,8 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
optimize="${compile.optimize}"
- encoding="ISO-8859-1">
+ encoding="ISO-8859-1"
+ includeantruntime="false">
@@ -1151,7 +1154,8 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
optimize="${compile.optimize}"
- encoding="ISO-8859-1">
+ encoding="ISO-8859-1"
+ includeantruntime="false">
@@ -2044,7 +2048,8 @@ Apache Tomcat ${version} native binaries
target="${compile.target}"
sourcepath="${tomcat-dbcp.home}/src/java"
srcdir="${tomcat-dbcp.home}/src/java"
- encoding="ISO-8859-1">
+ encoding="ISO-8859-1"
+ includeantruntime="false">
svn commit: r978840 [2/2] - in /tomcat/trunk/java/org/apache/catalina: core/ ha/session/ manager/ realm/ servlets/ session/ ssi/ startup/ tribes/group/interceptors/ tribes/membership/ tribes/transport
Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java?rev=978840&r1=978839&r2=978840&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java Sat
Jul 24 10:17:45 2010
@@ -27,21 +27,21 @@ import java.util.concurrent.TimeUnit;
public class ExecutorFactory {
- public static ExecutorService newThreadPool(int minThreads, int
maxThreads, long maxIdleTime, TimeUnit unit) {
- TaskQueue taskqueue = new TaskQueue();
- ThreadPoolExecutor service = new ThreadPoolExecutor(minThreads,
maxThreads, maxIdleTime, unit,taskqueue);
- taskqueue.setParent(service);
- return service;
- }
-
- public static ExecutorService newThreadPool(int minThreads, int
maxThreads, long maxIdleTime, TimeUnit unit, ThreadFactory threadFactory) {
- TaskQueue taskqueue = new TaskQueue();
- ThreadPoolExecutor service = new ThreadPoolExecutor(minThreads,
maxThreads, maxIdleTime, unit,taskqueue, threadFactory);
- taskqueue.setParent(service);
- return service;
- }
-
-// -- TaskQueue Inner Class
+public static ExecutorService newThreadPool(int minThreads, int
maxThreads, long maxIdleTime, TimeUnit unit) {
+TaskQueue taskqueue = new TaskQueue();
+ThreadPoolExecutor service = new ThreadPoolExecutor(minThreads,
maxThreads, maxIdleTime, unit,taskqueue);
+taskqueue.setParent(service);
+return service;
+}
+
+public static ExecutorService newThreadPool(int minThreads, int
maxThreads, long maxIdleTime, TimeUnit unit, ThreadFactory threadFactory) {
+TaskQueue taskqueue = new TaskQueue();
+ThreadPoolExecutor service = new ThreadPoolExecutor(minThreads,
maxThreads, maxIdleTime, unit,taskqueue, threadFactory);
+taskqueue.setParent(service);
+return service;
+}
+
+ // -- TaskQueue Inner Class
private static class TaskQueue extends LinkedBlockingQueue {
ThreadPoolExecutor parent = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r978847 - /tomcat/trunk/build.xml
Author: markt Date: Sat Jul 24 11:10:48 2010 New Revision: 978847 URL: http://svn.apache.org/viewvc?rev=978847&view=rev Log: Check the tests too. Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=978847&r1=978846&r2=978847&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Sat Jul 24 11:10:48 2010 @@ -418,6 +418,9 @@ + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r978862 - /tomcat/trunk/
Author: markt Date: Sat Jul 24 12:25:40 2010 New Revision: 978862 URL: http://svn.apache.org/viewvc?rev=978862&view=rev Log: Ignore config for checkstyle Eclipse plugin Modified: tomcat/trunk/ (props changed) Propchange: tomcat/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sat Jul 24 12:25:40 2010 @@ -3,3 +3,4 @@ .project output build.properties +.checkstyle - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r978865 [4/4] - in /tomcat/trunk: ./ java/org/apache/jasper/ java/org/apache/jasper/compiler/ java/org/apache/jasper/el/ java/org/apache/jasper/runtime/ java/org/apache/jasper/servlet/ jav
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=978865&r1=978864&r2=978865&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java Sat
Jul 24 13:03:11 2010
@@ -121,7 +121,7 @@ public class XMLEncodingDetector {
this.err=err;
createInitialReader();
scanXMLDecl();
-
+
return new Object[] { this.encoding,
Boolean.valueOf(this.isEncodingSetInProlog),
Boolean.valueOf(this.isBomPresent),
@@ -136,48 +136,48 @@ public class XMLEncodingDetector {
// org.apache.xerces.impl.XMLEntityManager.startEntity()
private void createInitialReader() throws IOException, JasperException {
- // wrap this stream in RewindableInputStream
- stream = new RewindableInputStream(stream);
+// wrap this stream in RewindableInputStream
+stream = new RewindableInputStream(stream);
- // perform auto-detect of encoding if necessary
- if (encoding == null) {
- // read first four bytes and determine encoding
- final byte[] b4 = new byte[4];
- int count = 0;
- for (; count<4; count++ ) {
- b4[count] = (byte)stream.read();
- }
- if (count == 4) {
- Object [] encodingDesc = getEncodingName(b4, count);
- encoding = (String)(encodingDesc[0]);
- isBigEndian = (Boolean)(encodingDesc[1]);
+// perform auto-detect of encoding if necessary
+if (encoding == null) {
+// read first four bytes and determine encoding
+final byte[] b4 = new byte[4];
+int count = 0;
+for (; count<4; count++ ) {
+b4[count] = (byte)stream.read();
+}
+if (count == 4) {
+Object [] encodingDesc = getEncodingName(b4, count);
+encoding = (String)(encodingDesc[0]);
+isBigEndian = (Boolean)(encodingDesc[1]);
-if (encodingDesc.length > 3) {
-isBomPresent = ((Boolean)(encodingDesc[2])).booleanValue();
-skip = ((Integer)(encodingDesc[3])).intValue();
-} else {
-isBomPresent = true;
-skip = ((Integer)(encodingDesc[2])).intValue();
-}
+if (encodingDesc.length > 3) {
+isBomPresent = ((Boolean)(encodingDesc[2])).booleanValue();
+skip = ((Integer)(encodingDesc[3])).intValue();
+} else {
+isBomPresent = true;
+skip = ((Integer)(encodingDesc[2])).intValue();
+}
- stream.reset();
- // Special case UTF-8 files with BOM created by Microsoft
- // tools. It's more efficient to consume the BOM than make
- // the reader perform extra checks. -Ac
- if (count > 2 && encoding.equals("UTF-8")) {
- int b0 = b4[0] & 0xFF;
- int b1 = b4[1] & 0xFF;
- int b2 = b4[2] & 0xFF;
- if (b0 == 0xEF && b1 == 0xBB && b2 == 0xBF) {
- // ignore first three bytes...
- stream.skip(3);
- }
- }
- reader = createReader(stream, encoding, isBigEndian);
- } else {
- reader = createReader(stream, encoding, isBigEndian);
- }
- }
+stream.reset();
+// Special case UTF-8 files with BOM created by Microsoft
+// tools. It's more efficient to consume the BOM than make
+// the reader perform extra checks. -Ac
+if (count > 2 && encoding.equals("UTF-8")) {
+int b0 = b4[0] & 0xFF;
+int b1 = b4[1] & 0xFF;
+int b2 = b4[2] & 0xFF;
+if (b0 == 0xEF && b1 == 0xBB && b2 == 0xBF) {
+// ignore first three bytes...
+stream.skip(3);
+}
+}
+reader = createReader(stream, encoding, isBigEndian);
+} else {
+reader = createReader(stream, encoding, isBigEndian);
+}
+}
}
// Adapted from:
@@ -199,7 +199,7 @@ public class XMLEncodingDetector {
* @return Returns a reader.
*/
private Reader createReader(InputStream inputStream, String encoding,
- Boolean isBigEndian)
+Boolean isBigEndian)
throws IOException, JasperException {
svn commit: r978952 - /tomcat/trunk/checkstyle.xml
Author: markt Date: Sun Jul 25 00:12:02 2010 New Revision: 978952 URL: http://svn.apache.org/viewvc?rev=978952&view=rev Log: Add additional tests known to pass - list provided by Marc Guillemot. Modified: tomcat/trunk/checkstyle.xml Modified: tomcat/trunk/checkstyle.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/checkstyle.xml?rev=978952&r1=978951&r2=978952&view=diff == --- tomcat/trunk/checkstyle.xml (original) +++ tomcat/trunk/checkstyle.xml Sun Jul 25 00:12:02 2010 @@ -19,5 +19,25 @@ "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";> + + + + + + + + + + + + + + + + + \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
