[patch] this tomcat patch adds build-examples ant task and overrides allowLinking parameter for /examples

tomcat-6_examples.patch (text/plain), 5.23 KB, created by Alexey Fansky on 2010-08-29 12:07:25 UTC

diff -uprN apache-tomcat-6.0.28-src.orig/build.xml apache-tomcat-6.0.28-src/build.xml
--- apache-tomcat-6.0.28-src.orig/build.xml	2010-06-29 17:33:40.000000000 +0300
+++ apache-tomcat-6.0.28-src/build.xml	2010-08-29 14:54:01.986584203 +0300
@@ -169,6 +169,115 @@
 
   <target name="build-only" depends="build-prepare,compile,package" />
 
+  <target name="build-examples" depends="build-prepare, compile">
+    <!-- Copy other regular webapps -->
+    <copy todir="${tomcat.build}/webapps">
+      <fileset dir="webapps">
+        <include name="examples/**"/>
+      </fileset>
+    </copy>
+    <!-- Build classes for examples webapp -->
+    <javac   srcdir="webapps/examples/WEB-INF/classes"
+             destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
+             debug="${compile.debug}" deprecation="${compile.deprecation}"
+             source="${compile.source}"
+             target="${compile.target}"
+             optimize="${compile.optimize}"
+             classpath="${basedir}/output/classes"
+             excludes="**/CVS/**,**/.svn/**"
+             encoding="ISO-8859-1">
+    </javac>
+
+    <javac   srcdir="webapps/examples/jsp/plugin/applet"
+             destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"
+             debug="${compile.debug}" deprecation="${compile.deprecation}"
+             source="${compile.source}"
+             target="${compile.target}"
+             optimize="${compile.optimize}"
+             classpath="${tomcat.classes}"
+             excludes="**/CVS/**,**/.svn/**"
+             encoding="ISO-8859-1">
+    </javac>
+
+    <!-- Add sources for examples -->
+    <taskdef    name="txt2html"
+           classname="org.apache.tomcat.buildutil.Txt2Html"
+           classpath="${tomcat.classes}" />
+    <txt2html todir="${tomcat.build}/webapps/examples/jsp/jsp2/simpletag">
+      <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples">
+        <include name="BookBean.java"/>
+      </fileset>
+      <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples/simpletag">
+        <include name="FindBookSimpleTag.java"/>
+        <include name="RepeatSimpleTag.java"/>
+        <include name="HelloWorldSimpleTag.java"/>
+      </fileset>
+      <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples/el">
+        <include name="Functions.java"/>
+      </fileset>
+    </txt2html>
+
+    <txt2html todir="${tomcat.build}/webapps/examples/jsp/jsp2/jspattribute">
+      <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples">
+        <include name="FooBean.java"/>
+      </fileset>
+      <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples/simpletag">
+        <include name="ShuffleSimpleTag.java"/>
+        <include name="TileSimpleTag.java"/>
+        <include name="HelloWorldSimpleTag.java"/>
+      </fileset>
+    </txt2html>
+
+    <txt2html todir="${tomcat.build}/webapps/examples/jsp/cal">
+      <fileset dir="webapps/examples/WEB-INF/classes/cal">
+        <include name="Entries.java"/>
+        <include name="Entry.java"/>
+        <include name="JspCalendar.java"/>
+        <include name="TableBean.java"/>
+      </fileset>
+    </txt2html>
+
+    <txt2html todir="${tomcat.build}/webapps/examples/jsp/jsptoserv">
+      <fileset dir="webapps/examples/WEB-INF/classes">
+        <include name="servletToJsp.java"/>
+      </fileset>
+    </txt2html>
+
+    <txt2html todir="${tomcat.build}/webapps/examples/jsp/jsp2/el">
+      <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples/el">
+        <include name="Functions.java"/>
+      </fileset>
+    </txt2html>
+
+    <txt2html todir="${tomcat.build}/webapps/examples/jsp/jsp2/misc">
+      <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples/simpletag">
+        <include name="EchoAttributesTag.java"/>
+      </fileset>
+    </txt2html>
+
+    <txt2html todir="${tomcat.build}/webapps/examples/jsp/jsp2/tagfiles">
+      <fileset dir="webapps/examples/WEB-INF/tags">
+        <include name="**/*.tag" />
+      </fileset>
+    </txt2html>
+
+    <txt2html todir="${tomcat.build}/webapps/examples">
+      <fileset dir="webapps/examples">
+        <include name="**/*.jsp" />
+        <include name="**/*.jspx" />
+        <include name="**/*.jspf" />
+        <exclude name="error/errorpge.jsp"/>
+        <exclude name="forward/one.jsp"/>
+        <exclude name="include/foo.jsp"/>
+        <exclude name="jsptoserv/hello.jsp"/>
+        <exclude name="security/protected/error.jsp"/>
+        <exclude name="security/protected/index.jsp"/>
+        <exclude name="security/protected/login.jsp"/>
+        <exclude name="source.jsp"/>
+      </fileset>
+    </txt2html>
+  </target>
+
   <!-- Pattern sets for jar files -->
   <patternset id="files.annotations-api">
     <include name="javax/annotation/*" />
diff -uprN apache-tomcat-6.0.28-src.orig/webapps/examples/META-INF/context.xml apache-tomcat-6.0.28-src/webapps/examples/META-INF/context.xml
--- apache-tomcat-6.0.28-src.orig/webapps/examples/META-INF/context.xml	1970-01-01 03:00:00.000000000 +0300
+++ apache-tomcat-6.0.28-src/webapps/examples/META-INF/context.xml	2010-08-29 14:33:48.918574214 +0300
@@ -0,0 +1,3 @@
+<?xml version='1.0' encoding='utf-8'?>
+<Context path="/examples" docbase="examples" override="true" allowLinking="true">
+</Context>
\ No newline at end of file