costin 01/05/27 23:48:15
Modified: jasper34 build.xml
jasper34/generator/org/apache/jasper34/generator
SetPropertyGenerator.java
jasper34/runtime/org/apache/jasper34/runtime
JspRuntimeLibrary.java
Added: jasper34/tools manifest.jspc
Log:
Fixed build.xml to include the javac adapters.
Added a manifest for jspc.
Revision Changes Path
1.3 +4 -1 jakarta-tomcat-jasper/jasper34/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper34/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 2001/05/28 02:20:42 1.2
+++ build.xml 2001/05/28 06:48:13 1.3
@@ -89,11 +89,14 @@
</fileset>
</copy>
- <jar jarfile="${build.dir}/jasper34.jar"
+ <jar manifest="${jasper34.src}/tools/manifest.jspc"
+ jarfile="${build.dir}/jasper34.jar"
basedir="${build.dir}/classes">
<include name="org/apache/jasper34/generator/**"/>
<include name="org/apache/jasper34/core/**"/>
+ <include name="org/apache/jasper34/javacompiler/**"/>
<include name="org/apache/jasper34/resources/**"/>
+
</jar>
</target>
1.2 +0 -4
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/SetPropertyGenerator.java
Index: SetPropertyGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/SetPropertyGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetPropertyGenerator.java 2001/05/27 23:19:31 1.1
+++ SetPropertyGenerator.java 2001/05/28 06:48:14 1.2
@@ -1,8 +1,4 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/SetPropertyGenerator.java,v
1.1 2001/05/27 23:19:31 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/27 23:19:31 $
- *
* ====================================================================
*
* The Apache Software License, Version 1.1
1.3 +0 -1
jakarta-tomcat-jasper/jasper34/runtime/org/apache/jasper34/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/runtime/org/apache/jasper34/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspRuntimeLibrary.java 2001/05/28 05:07:37 1.2
+++ JspRuntimeLibrary.java 2001/05/28 06:48:15 1.3
@@ -358,7 +358,6 @@
* @param unescString The string to shell-escape
* @return The escaped shell string.
*/
-
public static String escapeQueryString(String unescString) {
if ( unescString == null )
return null;
1.1 jakarta-tomcat-jasper/jasper34/tools/manifest.jspc
Index: manifest.jspc
===================================================================
Manifest-Version: 1.0
Main-Class: org.apache.jasper34.JspC
Class-Path: ../container/tomcat_util.jar ../common/tomcat_core.jar
../container/tomcat_modules.jar ../common/servlet.jar ../container/facade22.jar
../container/jaxp.jar ../container/parser.jar ../container/xerces.jar
../container/crimson.jar ../container/jasper.jar
