Author: markt
Date: Thu May 19 16:27:42 2011
New Revision: 1124987
URL: http://svn.apache.org/viewvc?rev=1124987&view=rev
Log:
More prep for BZ 33453. Include a comment header in generated Java files
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/webapps/docs/changelog.xml
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=1124987&r1=1124986&r2=1124987&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Thu May 19
16:27:42 2011
@@ -23,15 +23,19 @@ import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.TimeZone;
import java.util.Vector;
import javax.el.MethodExpression;
@@ -116,6 +120,8 @@ class Generator {
private Vector<String> tagHandlerPoolNames;
private GenBuffer charArrayBuffer;
+
+ private DateFormat timestampFormat;
/**
* @param s
@@ -3436,6 +3442,8 @@ class Generator {
if (isPoolingEnabled) {
tagHandlerPoolNames = new Vector<String>();
}
+ timestampFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ timestampFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
}
/**
@@ -3456,6 +3464,7 @@ class Generator {
if (gen.isPoolingEnabled) {
gen.compileTagHandlerPoolList(page);
}
+ gen.generateCommentHeader();
if (gen.ctxt.isTagFile()) {
JasperTagInfo tagInfo = (JasperTagInfo) gen.ctxt.getTagInfo();
gen.generateTagHandlerPreamble(tagInfo, page);
@@ -3479,6 +3488,15 @@ class Generator {
}
}
+ private void generateCommentHeader() {
+ out.println("/*");
+ out.println(" * Generated by the Jasper component of Apache Tomcat");
+ out.println(" * Version: " + ctxt.getServletContext().getServerInfo());
+ out.println(" * Generated at: " + timestampFormat.format(new Date()) +
+ " UTC");
+ out.println(" */");
+ }
+
/*
* Generates tag handler preamble.
*/
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1124987&r1=1124986&r2=1124987&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May 19 16:27:42 2011
@@ -68,6 +68,10 @@
<bug>51220</bug>: Add a system property to enable tag pooling with JSPs
that use a custom base class. Based on a patch by Dan Mikusa. (markt)
</add>
+ <add>
+ Include a comment header in generated java files that indicates when
the
+ file was generated and which version of Tomcat generated it. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
