You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@locus.apache.org on 2000/09/19 21:33:12 UTC
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper Options.java EmbededServletOptions.java JspC.java
pierred 00/09/19 12:33:12
Modified: jasper/src/share/org/apache/jasper Options.java
EmbededServletOptions.java JspC.java
Log:
Support for new initialization parameter
sax2DriverClassName. Until we have JAXP to support
SAX2.0, the SAX2.0 driver class name must be specified.
Revision Changes Path
1.2 +9 -3 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java
Index: Options.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Options.java 2000/08/12 00:52:06 1.1
+++ Options.java 2000/09/19 19:33:11 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java,v 1.1 2000/08/12 00:52:06 pierred Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/12 00:52:06 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java,v 1.2 2000/09/19 19:33:11 pierred Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/09/19 19:33:11 $
*
* ====================================================================
*
@@ -125,4 +125,10 @@
* ProtectionDomain for this JSP Context when using a SecurityManager
*/
public Object getProtectionDomain();
+
+ /**
+ * The SAX 2.0 driver class name.
+ * @@@ Temporary until JAXP supports SAX2.0
+ */
+ public String getSax2DriverClassName();
}
1.2 +17 -4 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java
Index: EmbededServletOptions.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EmbededServletOptions.java 2000/08/12 00:52:05 1.1
+++ EmbededServletOptions.java 2000/09/19 19:33:11 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v 1.1 2000/08/12 00:52:05 pierred Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/12 00:52:05 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v 1.2 2000/09/19 19:33:11 pierred Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/09/19 19:33:11 $
*
* ====================================================================
*
@@ -135,6 +135,10 @@
*/
public String jspCompilerPath = null;
+ /**
+ * SAX 2 driver class name
+ */
+ public String sax2DriverClassName;
/**
* Are we keeping generated code around?
@@ -207,6 +211,10 @@
return jspCompilerPath;
}
+ public String getSax2DriverClassName() {
+ return sax2DriverClassName;
+ }
+
/**
* Create an EmbededServletOptions object using data available from
* ServletConfig and ServletContext.
@@ -309,7 +317,12 @@
Logger.FATAL);
}
}
-
+
+ sax2DriverClassName =
+ config.getInitParameter("sax2DriverClassName");
+ if (sax2DriverClassName == null) {
+ sax2DriverClassName = "org.apache.xerces.parsers.SAXParser";
+ }
}
}
1.4 +12 -3 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspC.java 2000/08/31 17:14:11 1.3
+++ JspC.java 2000/09/19 19:33:11 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v 1.3 2000/08/31 17:14:11 shemnon Exp $
- * $Revision: 1.3 $
- * $Date: 2000/08/31 17:14:11 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v 1.4 2000/09/19 19:33:11 pierred Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/09/19 19:33:11 $
*
* ====================================================================
*
@@ -102,6 +102,7 @@
public static final String SWITCH_WEBAPP_XML = "-webxml";
public static final String SWITCH_MAPPED = "-mapped";
public static final String SWITCH_DIE = "-die";
+ public static final String SWITCH_SAX2 = "-sax2";
public static final int NO_WEBXML = 0;
public static final int INC_WEBXML = 10;
@@ -148,6 +149,8 @@
Vector extensions;
+ String sax2DriverClassName = "org.apache.xerces.parsers.SAXParser";
+
public boolean getKeepGenerated() {
// isn't this why we are running jspc?
return true;
@@ -203,6 +206,10 @@
public String getClassPath() {
return System.getProperty("java.class.path");
}
+
+ public String getSax2DriverClassName() {
+ return sax2DriverClassName;
+ }
int argPos;
// value set by beutifully obsfucscated java
@@ -308,6 +315,8 @@
dieLevel = DEFAULT_DIE_LEVEL;
}
die = dieLevel;
+ } else if (tok.startsWith(SWITCH_SAX2)) {
+ sax2DriverClassName = nextArg();
} else {
pushBackArg();
// Not a recognized Option? Start treting them as JSP Pages