You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jm...@apache.org on 2001/05/30 03:05:08 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/transform DTDResolver.java
jmcnally 01/05/29 18:05:08
Modified: src/java/org/apache/turbine/services/intake/transform
DTDResolver.java
src/java/org/apache/turbine/torque/engine/database/transform
DTDResolver.java
Log:
use Class.getResourceAsStream instead of Class.getResource
The latter is buggy in Linux, MacOSX, and some versions of windows. The
former at least works on Linux.
So the dtd's will be picked up from the jar instead of at jakarta.apache.org
Revision Changes Path
1.7 +9 -6 jakarta-turbine/src/java/org/apache/turbine/services/intake/transform/DTDResolver.java
Index: DTDResolver.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/transform/DTDResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DTDResolver.java 2001/05/05 15:26:58 1.6
+++ DTDResolver.java 2001/05/30 01:05:04 1.7
@@ -67,7 +67,7 @@
* Bug 4337703</a>
*
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: DTDResolver.java,v 1.6 2001/05/05 15:26:58 jvanzyl Exp $
+ * @version $Id: DTDResolver.java,v 1.7 2001/05/30 01:05:04 jmcnally Exp $
*/
public class DTDResolver implements EntityResolver
{
@@ -81,12 +81,15 @@
{
try
{
- URL url = getClass().getResource("intake.dtd");
- // jdk1.3 on linux and OSX return null for resources
- // within jar files!!
- if (url != null)
+ InputStream dtdStream =
+ getClass().getResourceAsStream("intake.dtd");
+
+ // getResource was buggy on many systems including Linux,
+ // OSX, and some versions of windows in jdk1.3.
+ // getResourceAsStream works on linux, maybe others?
+ if (dtdStream != null)
{
- databaseDTD = new InputSource(url.openStream());
+ databaseDTD = new InputSource(dtdStream);
}
}
catch (Exception ex)
1.5 +8 -6 jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/transform/DTDResolver.java
Index: DTDResolver.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/transform/DTDResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DTDResolver.java 2001/05/05 13:19:15 1.4
+++ DTDResolver.java 2001/05/30 01:05:06 1.5
@@ -68,7 +68,7 @@
* Bug 4337703</a>
*
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: DTDResolver.java,v 1.4 2001/05/05 13:19:15 jvanzyl Exp $
+ * @version $Id: DTDResolver.java,v 1.5 2001/05/30 01:05:06 jmcnally Exp $
*/
public class DTDResolver implements EntityResolver
{
@@ -82,13 +82,15 @@
{
try
{
- URL url = getClass().getResource("database.dtd");
+ InputStream dtdStream =
+ getClass().getResourceAsStream("database.dtd");
- // jdk1.3 on linux and OSX return null for resources
- // within jar files!!
- if (url != null)
+ // getResource was buggy on many systems including Linux,
+ // OSX, and some versions of windows in jdk1.3.
+ // getResourceAsStream works on linux, maybe others?
+ if (dtdStream != null)
{
- databaseDTD = new InputSource(url.openStream());
+ databaseDTD = new InputSource(dtdStream);
}
}
catch (Exception ex)
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org