costin 01/06/16 14:00:08
Modified: jasper34/liaison/org/apache/jasper34/liaison ManglerCli.java
OptionsProperties.java OptionsServletConfig.java
TagLibReader.java
Log:
Added code in OptionsServletConfig for special properties ( that are
set in the ServletContext as attributes ). ( this is used by JspServlet )
Fix TagLibReader for the new signatures.
Revision Changes Path
1.2 +3 -1
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/liaison/ManglerCli.java
Index: ManglerCli.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/liaison/ManglerCli.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ManglerCli.java 2001/06/12 15:33:21 1.1
+++ ManglerCli.java 2001/06/16 21:00:08 1.2
@@ -205,7 +205,9 @@
private final String getInitialClassName() {
String prefix = getPrefix(jsp.getPath());
- return prefix + getBaseClassName() + Constants.JSP_TOKEN + "0";
+ System.out.println(" XXX ManglerCli prefix=" + prefix );
+ return prefix + getBaseClassName();
+ // No versioning needed + Constants.JSP_TOKEN + "0";
}
private final String getBaseClassName() {
1.2 +3 -1
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/liaison/OptionsProperties.java
Index: OptionsProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/liaison/OptionsProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OptionsProperties.java 2001/06/12 15:32:39 1.1
+++ OptionsProperties.java 2001/06/16 21:00:08 1.2
@@ -64,7 +64,9 @@
/** Another implementation of Options, backed by a Properties file
- * and with no external dependencies.
+ * and with no external dependencies.
+ *
+ * You must set at least: SCRATCH_DIR
*
* @author Costin Manolache
*/
1.2 +23 -0
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/liaison/OptionsServletConfig.java
Index: OptionsServletConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/liaison/OptionsServletConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OptionsServletConfig.java 2001/06/12 15:32:39 1.1
+++ OptionsServletConfig.java 2001/06/16 21:00:08 1.2
@@ -106,6 +106,29 @@
}
public String getProperty( String s, String def ) {
+ // System.out.println("GetOption: " + s + " " + def );
+ // Special cases
+ if( Options.SCRATCH_DIR.equals( s ) ) {
+ String sd=config.getInitParameter(s);
+ if( sd==null ) {
+ File f=(File)context.getAttribute( Constants.TMP_DIR );
+ if( f==null ) return null;
+ sd=f.toString();
+ }
+ // Options will also try java.io.tmpdir
+ return sd;
+ }
+
+ if( Options.CLASS_PATH.equals( s ) ) {
+ String sd=config.getInitParameter(s);
+ if( sd==null ) {
+ sd=(String)context.
+ getAttribute( Constants.SERVLET_CLASSPATH );
+ }
+ // Options will also try java.io.tmpdir
+ return sd;
+ }
+
String v=config.getInitParameter( s );
if( v==null ) return def;
return v;
1.3 +3 -3
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/liaison/TagLibReader.java
Index: TagLibReader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/liaison/TagLibReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TagLibReader.java 2001/06/12 15:31:53 1.2
+++ TagLibReader.java 2001/06/16 21:00:08 1.3
@@ -117,8 +117,8 @@
this.libs=libs;
}
- public void readTagLib(TagLibraryInfoImpl tli,
- String prefix, String uriIn)
+ public void readTLD(TagLibraryInfoImpl tli,
+ String prefix, String uriIn, String jspBase)
throws IOException, JasperException
{
tli.setURI( uriIn );
@@ -127,7 +127,7 @@
// Try to resolve URI relative to the current JSP page
if (!uri.startsWith("/") && isRelativeURI(uri))
- uri = containerL.resolveRelativeUri(uri);
+ uri = containerL.resolveRelativeUri(uri, jspBase);
tli.setURI( uri ); // ?? as in the original code
