mpoeschl 2003/01/03 12:20:55
Modified: src/java/org/apache/torque/engine/database/transform
DTDResolver.java
Log:
formatting
Revision Changes Path
1.10 +9 -16
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.10
diff -u -r1.9 -r1.10
--- DTDResolver.java 8 Oct 2002 18:17:06 -0000 1.9
+++ DTDResolver.java 3 Jan 2003 20:20:54 -0000 1.10
@@ -62,9 +62,6 @@
/**
* 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>
@@ -72,10 +69,9 @@
*/
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.dtd";;
/** InputSource for <code>database.dtd</code>. */
private InputSource databaseDTD = null;
@@ -87,8 +83,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.
@@ -115,12 +111,10 @@
{
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 ");
+ System.out.println("Resolver: used database.dtd from "
+ + pkg + " package ");
return databaseDTD;
}
else if (systemId == null)
@@ -150,8 +144,7 @@
}
catch (IOException ex)
{
- System.err.println(
- "Couldn't read DTD specified in XML schema: "
+ System.err.println("Couldn't read DTD specified in XML schema: "
+ ex.getMessage());
//ex.printStackTrace();
return new InputSource();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
