diff options
| author | Tom Tromey <tromey@redhat.com> | 2002-12-31 22:28:02 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2002-12-31 22:28:02 +0000 |
| commit | 9d5d450bed2881e4cf6f523c7636d0191937789b (patch) | |
| tree | df231b2619a9905f021fcb8e45d416bd75259e97 | |
| parent | f0c5ff628bd69c3534437e7ba64ff37279e75e64 (diff) | |
| download | classpath-9d5d450bed2881e4cf6f523c7636d0191937789b.tar.gz | |
* java/util/logging/LogManager.java (readConfiguration): Remove
extra `lib'.
* javax/naming/InitialContext.java (init): Remove extra `lib'.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | java/util/logging/LogManager.java | 6 | ||||
| -rw-r--r-- | javax/naming/InitialContext.java | 2 |
3 files changed, 8 insertions, 4 deletions
@@ -1,5 +1,9 @@ 2002-12-31 Tom Tromey <tromey@redhat.com> + * java/util/logging/LogManager.java (readConfiguration): Remove + extra `lib'. + * javax/naming/InitialContext.java (init): Remove extra `lib'. + * javax/naming/InitialContext.java (init): Use gnu.classpath.home.url. * java/util/logging/LogManager.java (readConfiguration): Use diff --git a/java/util/logging/LogManager.java b/java/util/logging/LogManager.java index a137c8ef3..d6536e71d 100644 --- a/java/util/logging/LogManager.java +++ b/java/util/logging/LogManager.java @@ -93,7 +93,7 @@ import java.lang.ref.WeakReference; * * <li>If the system property <code>java.util.logging.config.file</code> * is not set, however, the contents of the URL - * "{gnu.classpath.home.url}/lib/logging.properties" are passed to + * "{gnu.classpath.home.url}/logging.properties" are passed to * {@link #readConfiguration(java.io.InputStream)}. * Here, "{gnu.classpath.home.url}" stands for the value of * the system property <code>gnu.classpath.home.url</code>.</li> @@ -469,7 +469,7 @@ public class LogManager * The name and location of this file are specified by the system * property <code>java.util.logging.config.file</code>. If this * property is not set, the URL - * "{gnu.classpath.home.url}/lib/logging.properties" is taken, where + * "{gnu.classpath.home.url}/logging.properties" is taken, where * "{gnu.classpath.home.url}" stands for the value of the system * property <code>gnu.classpath.home.url</code>. * @@ -496,7 +496,7 @@ public class LogManager if ((path == null) || (path.length() == 0)) { String url = (System.getProperty("gnu.classpath.home.url") - + "/lib/logging.properties"); + + "/logging.properties"); inputStream = new URL(url).openStream(); } else diff --git a/javax/naming/InitialContext.java b/javax/naming/InitialContext.java index 19f241772..705e24ad1 100644 --- a/javax/naming/InitialContext.java +++ b/javax/naming/InitialContext.java @@ -129,7 +129,7 @@ public class InitialContext implements Context String home = System.getProperty("gnu.classpath.home.url"); if (home != null) { - String url = home + "/lib/jndi.properties"; + String url = home + "/jndi.properties"; Properties p = new Properties (); try |