cvs commit: jakarta-tomcat-connectors/http11 build.xml
billbarker2005/04/14 20:10:02
Modified:http11 build.xml
Log:
Adding tomcat-jni.jar to the classpath, since it is now required.
Revision ChangesPath
1.18 +3 -1 jakarta-tomcat-connectors/http11/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 10 Mar 2004 22:35:10 - 1.17
+++ build.xml 15 Apr 2005 03:10:02 - 1.18
@@ -31,6 +31,7 @@
!-- The locations of necessary jar files --
property name=tomcat-util.jar
value=${util.home}/build/lib/tomcat-util.jar/
+ property name=tomcat-jni.jar
value=../jni/dist/tomcat-native-1.0.0.jar /
property name=tomcat-coyote.jar
value=${coyote.home}/build/lib/tomcat-coyote.jar/
property name=tomcat33-coyote.jar
value=${coyote.home}/build/lib/tomcat33-coyote.jar/
@@ -85,6 +86,7 @@
pathelement location=${commons-modeler.jar}/
pathelement location=${regexp.jar}/
pathelement location=${jmx.jar}/
+pathelement location=${tomcat-jni.jar} /
/path
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11 build.xml
markt 2004/03/10 14:35:10
Modified:coyote build.xml
http11 build.xml
Log:
- Fix bug 17315. Version info not set correctly in manifest files.
Revision ChangesPath
1.27 +2 -2 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.xml 4 May 2003 19:41:25 - 1.26
+++ build.xml 10 Mar 2004 22:35:10 - 1.27
@@ -232,7 +232,7 @@
jar jarfile=${tomcat-coyote.jar}
index=true
basedir=${build.home}/classes
- manifest=${conf.home}/MANIFEST.MF
+ manifest=${build.home}/conf/MANIFEST.MF
excludes=**/tomcat3/*
include name=org/apache/coyote/*.class /
include name=org/apache/coyote/memory/*.class /
1.17 +2 -2 jakarta-tomcat-connectors/http11/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 7 Oct 2003 14:28:34 - 1.16
+++ build.xml 10 Mar 2004 22:35:10 - 1.17
@@ -174,7 +174,7 @@
jarjarfile=${tomcat-http11.jar}
index=true
basedir=${build.home}/classes
- manifest=${conf.home}/MANIFEST.MF
+ manifest=${build.home}/conf/MANIFEST.MF
include name=org/apache/coyote/http11/**/
/jar
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11 build.xml build.properties.sample
hgomez 2003/10/07 01:48:38
Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java
http11 build.xml build.properties.sample
Log:
Add regexp support to check for Compression/HTTP 1.1 compatible browsers.
Revision ChangesPath
1.82 +77 -31
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- Http11Processor.java 1 Oct 2003 10:22:15 - 1.81
+++ Http11Processor.java 7 Oct 2003 08:48:37 - 1.82
@@ -81,6 +81,8 @@
import org.apache.coyote.http11.filters.IdentityOutputFilter;
import org.apache.coyote.http11.filters.VoidInputFilter;
import org.apache.coyote.http11.filters.VoidOutputFilter;
+import org.apache.regexp.RE;
+import org.apache.regexp.RESyntaxException;
import org.apache.tomcat.util.buf.Ascii;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.HexUtils;
@@ -203,7 +205,7 @@
/**
* List of restricted user agents.
*/
-protected String[] restrictedUserAgents = null;
+protected RE[] restrictedUserAgents = null;
/**
@@ -281,9 +283,8 @@
/**
* List of user agents to not use gzip with
*/
-protected String[] noCompressionUserAgents = null;
-
-
+protected RE noCompressionUserAgents[] = null;
+
/**
* List of MIMES which could be gzipped
*/
@@ -364,7 +365,10 @@
* @param userAgent user-agent string
*/
public void addNoCompressionUserAgent(String userAgent) {
-addStringArray(noCompressionUserAgents, userAgent);
+try {
+RE nRule = new RE(userAgent);
+addREArray(noCompressionUserAgents, new RE(userAgent));
+} catch (RESyntaxException ree) {}
}
@@ -373,7 +377,7 @@
* a large number of connectors, where it would be better to have all of
* them referenced a single array).
*/
-public void setNoCompressionUserAgents(String[] noCompressionUserAgents) {
+public void setNoCompressionUserAgents(RE[] noCompressionUserAgents) {
this.noCompressionUserAgents = noCompressionUserAgents;
}
@@ -394,15 +398,6 @@
}
}
-
-/**
- * Return the list of no compression user agents.
- */
-public String[] findNoCompressionUserAgents() {
-return (noCompressionUserAgents);
-}
-
-
/**
* Add a mime-type which will be compressable
* The mime-type String will be exactly matched
@@ -483,13 +478,38 @@
* @param value string
*/
private void addStringArray(String sArray[], String value) {
-if (sArray == null)
-sArray = new String[0];
-String[] results = new String[sArray.length + 1];
-for (int i = 0; i sArray.length; i++)
-results[i] = sArray[i];
-results[sArray.length] = value;
-sArray = results;
+if (sArray == null) {
+sArray = new String[1];
+sArray[0] = value;
+}
+else {
+String[] results = new String[sArray.length + 1];
+for (int i = 0; i sArray.length; i++)
+results[i] = sArray[i];
+results[sArray.length] = value;
+sArray = results;
+}
+}
+
+
+/**
+ * General use method
+ *
+ * @param rArray the REArray
+ * @param value Obj
+ */
+private void addREArray(RE rArray[], RE value) {
+if (rArray == null) {
+rArray = new RE[1];
+rArray[0] = value;
+}
+else {
+RE[] results = new RE[rArray.length + 1];
+for (int i = 0; i rArray.length; i++)
+results[i] = rArray[i];
+results[rArray.length] = value;
+rArray = results;
+}
}
@@ -529,13 +549,16 @@
/**
* Add restricted user-agent (which will downgrade the connector
- * to HTTP/1.0 mode). The user agent String given will be exactly matched
- * to the user-agent header submitted by the client.
+ * to HTTP/1.0 mode). The user agent String given will be matched
+ * via regexp to the user-agent header submitted by the client.
*
* @param userAgent user-agent string
*/
public void addRestrictedUserAgent(String userAgent) {
-addStringArray(restrictedUserAgents, userAgent);
+try {
+RE
cvs commit: jakarta-tomcat-connectors/http11 build.xml
costin 2003/04/04 14:15:40
Modified:http11 build.xml
Log:
Index, flag to skip docs
Revision ChangesPath
1.13 +6 -4 jakarta-tomcat-connectors/http11/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 13 Mar 2003 18:00:51 - 1.12
+++ build.xml 4 Apr 2003 22:15:40 - 1.13
@@ -139,7 +139,7 @@
/target
- target name=javadoc
+ target name=javadoc unless=docs-uptodate
description=Create component Javadoc documentation
mkdir dir=${build.home}/docs/api/
javadoc sourcepath=${source.home}
@@ -170,6 +170,7 @@
/copy
property name=tomcat-http11.jar
value=${build.home}/lib/tomcat-${component.name}.jar/
jarjarfile=${tomcat-http11.jar}
+ index=true
basedir=${build.home}/classes
manifest=${conf.home}/MANIFEST.MF
include name=org/apache/coyote/http11/**/
@@ -179,8 +180,9 @@
target name=compile depends=static,compile-only
description=Compile shareable components
jar jarfile=${build.home}/lib/tomcat33-resource.jar
-basedir=${build.home}/classes
- includes=**/*.properties /
+ index=true
+ basedir=${build.home}/classes
+ includes=**/*.properties /
copy file=${tomcat-util.jar}
tofile=${build.home}/lib/tomcat-util.jar /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11 build.xml
luehe 2003/03/13 10:00:51
Modified:coyote build.xml
http11 build.xml
Log:
Fix for build breaker (submitted by Rajiv Mordani)
Revision ChangesPath
1.22 +2 -1 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.xml 17 Feb 2003 01:47:36 - 1.21
+++ build.xml 13 Mar 2003 18:00:51 - 1.22
@@ -307,6 +307,7 @@
target name=javadoc
description=Create component Javadoc documentation
+mkdir dir=${build.home}/docs/api/
javadoc sourcepath=${source.home}
destdir=${build.home}/docs/api
packagenames=org.apache.coyote
1.12 +2 -1 jakarta-tomcat-connectors/http11/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 17 Feb 2003 01:49:12 - 1.11
+++ build.xml 13 Mar 2003 18:00:51 - 1.12
@@ -141,6 +141,7 @@
target name=javadoc
description=Create component Javadoc documentation
+mkdir dir=${build.home}/docs/api/
javadoc sourcepath=${source.home}
destdir=${build.home}/docs/api
packagenames=org.apache.coyote.*
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11 build.xml
larryi 2003/02/16 17:49:12
Modified:http11 build.xml
Log:
Allow some independence from the version of util, and coyote if desired.
Revision ChangesPath
1.11 +8 -4 jakarta-tomcat-connectors/http11/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 16 Jan 2003 22:29:51 - 1.10
+++ build.xml 17 Feb 2003 01:49:12 - 1.11
@@ -21,15 +21,19 @@
!-- The directories corresponding to your necessary dependencies --
property name=junit.home value=/usr/local/junit3.5/
+ !-- Dependencies within jakarta-tomcat-connectors --
+ property name=util.home value=../util/
+ property name=coyote.home value=../coyote/
+
!-- == Derived Values --
!-- The locations of necessary jar files --
- property name=tomcat-util.jar value=../util/build/lib/tomcat-util.jar/
- property name=tomcat-coyote.jar value=../coyote/build/lib/tomcat-coyote.jar/
+ property name=tomcat-util.jar value=${util.home}/build/lib/tomcat-util.jar/
+ property name=tomcat-coyote.jar
value=${coyote.home}/build/lib/tomcat-coyote.jar/
property name=tomcat33-coyote.jar
- value=../coyote/build/lib/tomcat33-coyote.jar/
+ value=${coyote.home}/build/lib/tomcat33-coyote.jar/
property name=junit.jarvalue=${junit.home}/junit.jar/
property name=jmx.jar location=../lib/mx4j.jar /
property name=commons-modeler.jar
location=../../jakarta-commons/modeler/dist/commons-modeler.jar /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11 build.xml
larryi 2003/02/16 17:50:02
Modified:http11 Tag: coyote_10 build.xml
Log:
Allow some independence from the version of util, and coyote if desired.
Revision ChangesPath
No revision
No revision
1.9.2.1 +8 -4 jakarta-tomcat-connectors/http11/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/build.xml,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- build.xml 13 Nov 2002 00:14:25 - 1.9
+++ build.xml 17 Feb 2003 01:50:02 - 1.9.2.1
@@ -21,15 +21,19 @@
!-- The directories corresponding to your necessary dependencies --
property name=junit.home value=/usr/local/junit3.5/
+ !-- Dependencies within jakarta-tomcat-connectors --
+ property name=util.home value=../util/
+ property name=coyote.home value=../coyote/
+
!-- == Derived Values --
!-- The locations of necessary jar files --
- property name=tomcat-util.jar value=../util/build/lib/tomcat-util.jar/
- property name=tomcat-coyote.jar value=../coyote/build/lib/tomcat-coyote.jar/
+ property name=tomcat-util.jar value=${util.home}/build/lib/tomcat-util.jar/
+ property name=tomcat-coyote.jar
value=${coyote.home}/build/lib/tomcat-coyote.jar/
property name=tomcat33-coyote.jar
- value=../coyote/build/lib/tomcat33-coyote.jar/
+ value=${coyote.home}/build/lib/tomcat33-coyote.jar/
property name=junit.jarvalue=${junit.home}/junit.jar/
property name=commons-logging.jar value=../lib/commons-logging.jar /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11 build.xml
costin 2002/11/12 16:14:25
Modified:http11 build.xml
Log:
A small change to allow 'compile only' in a separate dir.
Revision ChangesPath
1.9 +13 -6 jakarta-tomcat-connectors/http11/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 16 Mar 2002 03:51:25 - 1.8
+++ build.xml 13 Nov 2002 00:14:25 - 1.9
-146,9 +146,9
/javadoc
/target
+ target name=compile-only
+ description=Compile shareable components
- target name=compile depends=static
- description=Compile shareable components
javac srcdir=${source.home}
destdir=${build.home}/classes
debug=${compile.debug}
-159,13 +159,20
copytodir=${build.home}/classes filtering=on
fileset dir=${source.home} excludes=**/*.java/
/copy
-jarjarfile=${build.home}/lib/tomcat-${component.name}.jar
+property name=tomcat-http11.jar
value=${build.home}/lib/tomcat-${component.name}.jar/
+jarjarfile=${tomcat-http11.jar}
basedir=${build.home}/classes
- manifest=${build.home}/conf/MANIFEST.MF/
+ manifest=${conf.home}/MANIFEST.MF
+ include name=org/apache/coyote/http11/**/
+/jar
+ /target
+
+ target name=compile depends=static,compile-only
+ description=Compile shareable components
jar jarfile=${build.home}/lib/tomcat33-resource.jar
basedir=${build.home}/classes
includes=**/*.properties /
-
+
copy file=${tomcat-util.jar}
tofile=${build.home}/lib/tomcat-util.jar /
copy file=${tomcat-coyote.jar}
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-connectors/http11 build.xml
billbarker02/03/15 19:51:25
Modified:http11 build.xml
Log:
Add the default commons-logging.jar.
This way lazy people (like me) can build without the build.properties file.
Revision ChangesPath
1.8 +2 -2 jakarta-tomcat-connectors/http11/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 15 Mar 2002 05:36:02 - 1.7
+++ build.xml 16 Mar 2002 03:51:25 - 1.8
@@ -3,7 +3,7 @@
!--
Coyote connector framework for Jakarta Tomcat
-$Id: build.xml,v 1.7 2002/03/15 05:36:02 remm Exp $
+$Id: build.xml,v 1.8 2002/03/16 03:51:25 billbarker Exp $
--
@@ -31,7 +31,7 @@
property name=tomcat33-coyote.jar
value=../coyote/build/lib/tomcat33-coyote.jar/
property name=junit.jarvalue=${junit.home}/junit.jar/
-
+ property name=commons-logging.jar value=../lib/commons-logging.jar /
!-- == Component Declarations --
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11 build.xml
billbarker02/03/11 20:34:56
Modified:http11 build.xml
Log:
Fix classpath problem for 3.3.x.
The StringManager needs to load from the common ClassLoader, but the rest of the
Coyote classes are in the container ClassLoader. This creates a small jar to put in
common to find the properties.
Revision ChangesPath
1.5 +5 -1 jakarta-tomcat-connectors/http11/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 31 Jan 2002 18:42:57 - 1.4
+++ build.xml 12 Mar 2002 04:34:56 - 1.5
@@ -3,7 +3,7 @@
!--
Coyote connector framework for Jakarta Tomcat
-$Id: build.xml,v 1.4 2002/01/31 18:42:57 remm Exp $
+$Id: build.xml,v 1.5 2002/03/12 04:34:56 billbarker Exp $
--
@@ -158,6 +158,10 @@
jarjarfile=${build.home}/lib/tomcat-${component.name}.jar
basedir=${build.home}/classes
manifest=${build.home}/conf/MANIFEST.MF/
+jar jarfile=${build.home}/lib/tomcat33-resource.jar
+basedir=${build.home}/classes
+ includes=**/*.properties /
+
copy file=${tomcat-util.jar}
tofile=${build.home}/lib/tomcat-util.jar /
copy file=${tomcat-coyote.jar}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11 build.xml
billbarker02/03/11 22:15:45
Modified:http11 build.xml
Log:
Add copy for the Tomcat 3.3 jar.
Note: With the current build files, the tomcat33 jar will still be created even if
you don't have Tomcat 3.3 installed (it just won't be functional). This means that
the copy is still safe.
Revision ChangesPath
1.6 +5 -1 jakarta-tomcat-connectors/http11/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 12 Mar 2002 04:34:56 - 1.5
+++ build.xml 12 Mar 2002 06:15:45 - 1.6
@@ -3,7 +3,7 @@
!--
Coyote connector framework for Jakarta Tomcat
-$Id: build.xml,v 1.5 2002/03/12 04:34:56 billbarker Exp $
+$Id: build.xml,v 1.6 2002/03/12 06:15:45 billbarker Exp $
--
@@ -28,6 +28,8 @@
!-- The locations of necessary jar files --
property name=tomcat-util.jar value=../util/build/lib/tomcat-util.jar/
property name=tomcat-coyote.jar value=../coyote/build/lib/tomcat-coyote.jar/
+ property name=tomcat33-coyote.jar
+ value=../coyote/build/lib/tomcat33-coyote.jar/
property name=junit.jarvalue=${junit.home}/junit.jar/
@@ -166,6 +168,8 @@
tofile=${build.home}/lib/tomcat-util.jar /
copy file=${tomcat-coyote.jar}
tofile=${build.home}/lib/tomcat-coyote.jar /
+copy file=${tomcat33-coyote.jar}
+ tofile=${build.home}/lib/tomcat33-coyote.jar /
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11 build.xml
remm02/01/25 09:30:14 Modified:http11 build.xml Log: - Harmonize JAR names (so that the JAR name matches the name of the connector or component). Revision ChangesPath 1.3 +2 -2 jakarta-tomcat-connectors/http11/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/http11/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- build.xml 2 Jan 2002 15:06:35 - 1.2 +++ build.xml 25 Jan 2002 17:30:14 - 1.3 @@ -3,7 +3,7 @@ !-- Coyote connector framework for Jakarta Tomcat -$Id: build.xml,v 1.2 2002/01/02 15:06:35 remm Exp $ +$Id: build.xml,v 1.3 2002/01/25 17:30:14 remm Exp $ -- @@ -35,7 +35,7 @@ !-- The name of this component -- - property name=component.name value=coyote-http11/ + property name=component.name value=http11/ !-- The title of this component -- property name=component.title value=Coyote HTTP/1.1 Connector/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
