remm 2004/01/26 11:48:01
Modified: catalina/src/share/org/apache/catalina/startup
SetAllPropertiesRule.java Embedded.java
TldConfig.java
Log:
- Remove compilation warnings.
Revision Changes Path
1.4 +5 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java
Index: SetAllPropertiesRule.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetAllPropertiesRule.java 14 Nov 2003 10:02:10 -0000 1.3
+++ SetAllPropertiesRule.java 26 Jan 2004 19:48:01 -0000 1.4
@@ -91,7 +91,8 @@
*
* @exception Exception if a processing error occurs
*/
- public void begin(Attributes attributes) throws Exception {
+ public void begin(String namespace, String nameX, Attributes attributes)
+ throws Exception {
for (int i = 0; i < attributes.getLength(); i++) {
String name = attributes.getLocalName(i);
1.12 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Embedded.java 14 Oct 2003 21:34:58 -0000 1.11
+++ Embedded.java 26 Jan 2004 19:48:01 -0000 1.12
@@ -742,7 +742,7 @@
*/
public String getInfo() {
- return (this.info);
+ return (info);
}
1.35 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
Index: TldConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- TldConfig.java 20 Dec 2003 23:04:02 -0000 1.34
+++ TldConfig.java 26 Jan 2004 19:48:01 -0000 1.35
@@ -230,7 +230,7 @@
* @param xmlValidation true to enable xml instance validation
*/
public void setXmlValidation(boolean xmlValidation){
- this.xmlValidation = xmlValidation;
+ TldConfig.xmlValidation = xmlValidation;
}
/**
@@ -258,7 +258,7 @@
* @param xmlNamespaceAware true to enable namespace awareness
*/
public void setXmlNamespaceAware(boolean xmlNamespaceAware){
- this.xmlNamespaceAware=xmlNamespaceAware;
+ TldConfig.xmlNamespaceAware = xmlNamespaceAware;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
