jstrachan 01/05/07 07:31:56
Modified: io build.xml
io/src/org/apache/taglibs/io PipeHelper.java
xtags build.xml
Log:
Patched build files to take advantage of Tim's cool default.pre and default.post
mechanism for customising build targets. (I finally figured out how to do it ;-). So
now only standard build targets are used, but the local build targets override things
Revision Changes Path
1.4 +5 -2 jakarta-taglibs/io/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/io/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2001/05/05 14:27:04 1.3
+++ build.xml 2001/05/07 14:31:39 1.4
@@ -4,11 +4,14 @@
<!ENTITY common SYSTEM "file:../common.xml">
]>
-<project name="io" default="mymain">
+<project name="io" default="main">
+ <property name="library.pre" value="library.pre"/>
+
+ <target name="library.pre" depends="gen-docs"/>
+
&common;
- <target name="mymain" depends="gen-docs,main"/>
</project>
1.2 +9 -4 jakarta-taglibs/io/src/org/apache/taglibs/io/PipeHelper.java
Index: PipeHelper.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/io/src/org/apache/taglibs/io/PipeHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PipeHelper.java 2001/05/04 18:08:11 1.1
+++ PipeHelper.java 2001/05/07 14:31:46 1.2
@@ -79,12 +79,15 @@
/** A collection of helper methods for pipelining data between tags.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class PipeHelper {
/** Size of the buffer used when piping a stream */
protected static final int BUFFER_SIZE = 64 * 1024;
+
+ /** Temporarily disable the closing of Readers */
+ protected static final boolean CLOSE_READER = false;
/** Uses the standard pipelining guidelines to produce a Reader
@@ -148,10 +151,12 @@
}
}
finally {
- try {
- reader.close();
- }
- catch (IOException e) {
+ if ( CLOSE_READER ) {
+ try {
+ reader.close();
+ }
+ catch (Exception e) {
+ }
}
}
}
1.3 +3 -6 jakarta-taglibs/xtags/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 2001/05/07 12:12:13 1.2
+++ build.xml 2001/05/07 14:31:53 1.3
@@ -4,23 +4,20 @@
<!ENTITY common SYSTEM "file:../common.xml">
]>
-<project name="xtags" default="mymain">
+<project name="xtags" default="main">
<property environment="env"/>
<property name="classpath"
value="${env.SERVLET_JAR}:lib/dom4j-all.jar:lib/log4j-core.jar" />
+ <property name="library.pre" value="library.pre"/>
- <target name="mymain" depends="gen-docs,main,compile-examples.pre"/>
-
<!-- =================================================================== -->
<!-- copy the dom4j and log4j jars into the examples lib dir -->
<!-- =================================================================== -->
- <target name="compile-examples.pre">
+ <target name="library.pre" depends="gen-docs">
<copy todir="${build.examples}/WEB-INF/lib">
<fileset dir="lib" includes="*.jar"/>
</copy>
</target>
-
- <property name="compile-examples.pre" value="compile-examples.pre"/>
&common;
