morgand 01/08/23 09:01:12
Modified: latka/doc SampleSuite2.xml
latka/src/java/org/apache/commons/latka/xml
RequestHandler.java SessionHandler.java
SuiteHandler.java XMLPreprocessor.java
Log:
Latka no longer stores its configuration in System properties
Revision Changes Path
1.4 +1 -1 jakarta-commons/latka/doc/SampleSuite2.xml
Index: SampleSuite2.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/doc/SampleSuite2.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SampleSuite2.xml 2001/08/20 17:08:36 1.3
+++ SampleSuite2.xml 2001/08/23 16:01:12 1.4
@@ -1,6 +1,6 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE suite SYSTEM "../conf/suite.dtd">
-<suite defaultHost="jakarta.apache.org" label="Tablibs">
+<suite defaultHost="jakarta.apache.org" label="Taglibs">
<!-- confirm that docs for all Jakarta Commons components are present -->
1.10 +18 -13
jakarta-commons/latka/src/java/org/apache/commons/latka/xml/RequestHandler.java
Index: RequestHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/xml/RequestHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RequestHandler.java 2001/08/21 21:09:15 1.9
+++ RequestHandler.java 2001/08/23 16:01:12 1.10
@@ -1,5 +1,13 @@
package org.apache.commons.latka.xml;
+import java.io.IOException;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import java.util.Properties;
+
+import org.apache.commons.latka.LatkaProperties;
import org.apache.commons.latka.ValidationException;
import org.apache.commons.latka.event.*;
@@ -15,14 +23,8 @@
import org.apache.commons.latka.validators.StatusCodeValidator;
import org.apache.commons.latka.validators.CookieValidator;
-import java.io.IOException;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
import org.apache.log4j.Category;
-
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -44,26 +46,29 @@
Category.getInstance(RequestHandler.class);
public RequestHandler(XMLReader reader, Session session,
- String defaultHost,
- int defaultPort, LatkaEventInfo listener)
+ LatkaEventInfo listener)
{
super(reader);
_session = session;
- _defaultHost = defaultHost;
- _defaultPort = defaultPort;
_listener = listener;
_skipped = false;
+
+ Properties props = LatkaProperties.getProperties();
+ _defaultHost = props.getProperty("latka.defaultHost");
+ String portString = props.getProperty("latka.defaultPort");
+ if (portString != null) {
+ _defaultPort = Integer.parseInt(portString);
+ }
+
log.debug("request handler instantiated");
}
public RequestHandler(XMLReader reader,
Session session,
- String defaultHost,
- int defaultPort,
LatkaEventInfo listener,
boolean skip)
{
- this(reader,session,defaultHost,defaultPort,listener);
+ this(reader,session,listener);
_skipped = skip;
}
1.7 +3 -5
jakarta-commons/latka/src/java/org/apache/commons/latka/xml/SessionHandler.java
Index: SessionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/xml/SessionHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SessionHandler.java 2001/08/21 15:42:58 1.6
+++ SessionHandler.java 2001/08/23 16:01:12 1.7
@@ -11,16 +11,14 @@
public class SessionHandler extends LatkaHandler {
protected LatkaEventInfo _listener = null;
- protected SuiteHandler _handler = null;
protected SessionImpl _session = null;
// session cache
protected HashMap _sessionCache = new HashMap();
- public SessionHandler(XMLReader reader, SuiteHandler handler, LatkaEventInfo
listener) {
+ public SessionHandler(XMLReader reader, LatkaEventInfo listener) {
super(reader);
- _handler = handler;
_listener = listener;
log.debug("session handler instantiated");
}
@@ -36,11 +34,11 @@
if(_listener.didSessionSucceed(_session) == false) {
handler =
new RequestHandler(_reader,_session,
-
_handler._defaultHost,_handler._defaultPort,_listener,true);
+ _listener,true);
} else {
handler =
new RequestHandler(_reader,_session,
-
_handler._defaultHost,_handler._defaultPort,_listener);
+ _listener);
}
handler.delegate(uri,localName,qName,atts);
}
1.9 +7 -12
jakarta-commons/latka/src/java/org/apache/commons/latka/xml/SuiteHandler.java
Index: SuiteHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/xml/SuiteHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SuiteHandler.java 2001/08/22 21:40:39 1.8
+++ SuiteHandler.java 2001/08/23 16:01:12 1.9
@@ -18,8 +18,6 @@
public class SuiteHandler extends LatkaHandler {
protected LatkaEventInfo _listener = null;
- protected String _defaultHost = null;
- protected int _defaultPort = 80;
protected static Category log =
Category.getInstance(SuiteHandler.class);
@@ -38,29 +36,26 @@
Properties props = LatkaProperties.getProperties();
- // create the client object
- _defaultHost =
- props.getProperty("latka.defaultHost", atts.getValue("defaultHost"));
-
- String portString = props.getProperty("latka.defaultPort");
- if (portString == null) {
- portString = atts.getValue("defaultPort");
+ String defaultHost = atts.getValue("defaultHost");
+ if (defaultHost != null) {
+ props.setProperty("latka.defaultHost",defaultHost);
}
+ String portString = atts.getValue("defaultPort");
if (portString != null) {
- _defaultPort = Integer.parseInt(portString);
+ props.setProperty("latka.defaultPort",portString);
}
} else if (localName.equals("session")) {
- SessionHandler handler = new SessionHandler(_reader, this, _listener);
+ SessionHandler handler = new SessionHandler(_reader, _listener);
handler.delegate(uri,localName,qName,atts);
} else if (localName.equals("request")) {
// implicit session
SessionImpl session = new SessionImpl();
RequestHandler handler =
- new RequestHandler(_reader,session,_defaultHost, _defaultPort,_listener);
+ new RequestHandler(_reader,session,_listener);
handler.delegate(uri,localName,qName,atts);
}
1.4 +12 -1
jakarta-commons/latka/src/java/org/apache/commons/latka/xml/XMLPreprocessor.java
Index: XMLPreprocessor.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/xml/XMLPreprocessor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLPreprocessor.java 2001/08/20 17:08:38 1.3
+++ XMLPreprocessor.java 2001/08/23 16:01:12 1.4
@@ -6,6 +6,10 @@
import java.io.Reader;
import java.io.StringReader;
+import java.util.Properties;
+
+import org.apache.commons.latka.LatkaProperties;
+
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
@@ -40,6 +44,8 @@
StringBuffer output = new StringBuffer();
+ Properties props = LatkaProperties.getProperties();
+
try {
RE r = new RE("\\$\\{(.*?)\\}"); // Compile expression
@@ -52,8 +58,13 @@
output.append(string.substring(bufIndex,r.getParenStart(0)));
// move marker to the end of the match
bufIndex = r.getParenEnd(0);
+
+ String prop = props.getProperty(r.getParen(1));
+ if (prop == null) {
+ throw new NullPointerException("Property " + prop + " was not defined.");
+ }
// append the substituted value to the end of the output
- output.append(System.getProperty(r.getParen(1),r.getParen(0)));
+ output.append(prop);
}
// grab anything remaining that did not match
