balld 00/06/07 12:40:49
Modified: . changes.xml
samples/sql taglib.xml
src/org/apache/cocoon Engine.java
Log:
disabled cocoon comment for HEAD requests
Revision Changes Path
1.81 +4 -1 xml-cocoon/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/changes.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- changes.xml 2000/06/04 20:03:32 1.80
+++ changes.xml 2000/06/07 19:40:40 1.81
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.80 2000/06/04 20:03:32 balld Exp $
+ $Id: changes.xml,v 1.81 2000/06/07 19:40:40 balld Exp $
-->
<changes title="History of Changes">
@@ -16,6 +16,9 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="DB" type="fix" due-to="Jeremy Quinn" due-to-email="[EMAIL
PROTECTED]">
+ Disabled "created by cocoon" comment for HTTP HEAD requests.
+ </action>
<action dev="DB" type="fix" due-to="Jeremy Quinn" due-to-email="[EMAIL
PROTECTED]">
Added HTTP method to Utils.encode so HEAD and GET are distinguishable
</action>
1.3 +13 -8 xml-cocoon/samples/sql/taglib.xml
Index: taglib.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/samples/sql/taglib.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- taglib.xml 2000/04/28 19:19:15 1.2
+++ taglib.xml 2000/06/07 19:40:45 1.3
@@ -13,14 +13,19 @@
<sql:execute-query>
<sql:driver>org.gjt.mm.mysql.Driver</sql:driver>
<sql:dburl>jdbc:mysql://localhost/test</sql:dburl>
- <sql:doc-element>options</sql:doc-element>
- <sql:row-element>options</sql:row-element>
- <sql:tag-case>lower</sql:tag-case>
- <sql:null-indicator>yes</sql:null-indicator>
- <sql:id-attribute>ID</sql:id-attribute>
- <sql:id-attribute-column>foo_id</sql:id-attribute-column>
- <sql:query>select * from foo_table</sql:query>
- <sql:count-attribute>count</sql:count-attribute>
+ <sql:query>select * from column_type_table</sql:query>
+ <sql:doc-element>things</sql:doc-element>
+ <sql:row-element>thing</sql:row-element>
+ <sql:column-format>
+ <sql:name>my_date</sql:name>
+ <sql:class>java.text.SimpleDateFormat</sql:class>
+ <sql:parameter>MM/dd/yyyy</sql:parameter>
+ </sql:column-format>
+ <sql:column-format>
+ <sql:name>my_time</sql:name>
+ <sql:class>java.text.SimpleDateFormat</sql:class>
+ <sql:parameter>hh:mm (ss)</sql:parameter>
+ </sql:column-format>
</sql:execute-query>
</page>
1.30 +4 -3 xml-cocoon/src/org/apache/cocoon/Engine.java
Index: Engine.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Engine.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Engine.java 2000/05/25 14:06:34 1.29
+++ Engine.java 2000/06/07 19:40:47 1.30
@@ -1,4 +1,4 @@
-/*-- $Id: Engine.java,v 1.29 2000/05/25 14:06:34 stefano Exp $ --
+/*-- $Id: Engine.java,v 1.30 2000/06/07 19:40:47 balld Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -73,7 +73,7 @@
* This class implements the engine that does all the document processing.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.29 $ $Date: 2000/05/25 14:06:34 $
+ * @version $Revision: 1.30 $ $Date: 2000/06/07 19:40:47 $
*/
public class Engine implements Defaults {
@@ -365,8 +365,9 @@
out.println(page.getContent());
// if verbose mode is on the the output type allows it
+ // and the HTTP request isn't a HEAD
// print some processing info as a comment
- if (VERBOSE && (page.isText())) {
+ if (VERBOSE && (page.isText()) &&
!request.getMethod().equals("HEAD")) {
time = System.currentTimeMillis() - time;
out.println("<!-- This page was served "
+ (page.isCached() ? "from cache " : "")
