quintonm 2003/01/31 08:42:19
Modified: src/java/org/apache/torque/engine/database/transform Tag:
TORQUE_3_0_BRANCH DTDResolver.java
Log:
- Changed logging from System.out to log4j
- Resolver will now use database.dtd on classpath
if the DTS is http://jakarta.apache.org/turbine/dtd/database_3_0_1.dtd
Revision Changes Path
No revision
No revision
1.9.2.1 +25 -21
jakarta-turbine-torque/src/java/org/apache/torque/engine/database/transform/DTDResolver.java
Index: DTDResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/transform/DTDResolver.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- DTDResolver.java 8 Oct 2002 18:17:06 -0000 1.9
+++ DTDResolver.java 31 Jan 2003 16:42:19 -0000 1.9.2.1
@@ -57,29 +57,32 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+
+import org.apache.log4j.Logger;
+
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
/**
* A resolver to get the database.dtd file for the XML parser from the jar.
- * This does not work with jdk1.3 on linux, see
- * <a href="http://developer.java.sun.com/developer/bugParade/bugs/4337703.html";>
- * Bug 4337703</a>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Kurt Schrader</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Quinton McCombs</a>
* @version $Id$
*/
public class DTDResolver implements EntityResolver
{
-
/** Where the DTD is located on the web. */
- private static final String WEB_SITE_DTD =
- "http://jakarta.apache.org/turbine/dtd/database.dtd";;
+ private static final String WEB_SITE_DTD
+ = "http://jakarta.apache.org/turbine/dtd/database_3_0_1.dtd";;
/** InputSource for <code>database.dtd</code>. */
private InputSource databaseDTD = null;
+ /** Logging */
+ private static Logger log = Logger.getLogger(DTDResolver.class);
+
/**
* constructor
*/
@@ -87,8 +90,8 @@
{
try
{
- InputStream dtdStream =
- getClass().getResourceAsStream("database.dtd");
+ InputStream dtdStream
+ = getClass().getResourceAsStream("database.dtd");
// getResource was buggy on many systems including Linux,
// OSX, and some versions of windows in jdk1.3.
@@ -97,10 +100,14 @@
{
databaseDTD = new InputSource(dtdStream);
}
+ else
+ {
+ log.warn("Could not located the database.dtd");
+ }
}
catch (Exception ex)
{
- ex.printStackTrace();
+ log.error("Could not get stream for database.dtd", ex );
}
}
@@ -115,22 +122,22 @@
{
if (databaseDTD != null && WEB_SITE_DTD.equals(systemId))
{
- String pkg =
- getClass().getName().substring(
- 0,
+ String pkg = getClass().getName().substring(0,
getClass().getName().lastIndexOf("."));
- System.out.println(
- "Resolver: used database.dtd from " + pkg + " package ");
+
+ log.info("Resolver: used database.dtd from "
+ + pkg + " package ");
+
return databaseDTD;
}
else if (systemId == null)
{
- System.out.println("Resolver: used " + WEB_SITE_DTD);
+ log.info("Resolver: used " + WEB_SITE_DTD);
return getInputSource(WEB_SITE_DTD);
}
else
{
- System.out.println("Resolver: used " + systemId);
+ log.info("Resolver: used " + systemId);
return getInputSource(systemId);
}
}
@@ -150,10 +157,7 @@
}
catch (IOException ex)
{
- System.err.println(
- "Couldn't read DTD specified in XML schema: "
- + ex.getMessage());
- //ex.printStackTrace();
+ log.error("Couldn't read DTD specified in XML schema: ", ex);
return new InputSource();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
