aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2003-11-25 01:57:29 +0000
committerTom Tromey <tromey@gcc.gnu.org>2003-11-25 01:57:29 +0000
commit2758ce13c10fa263187bfc6acaca0a3eec8a731f (patch)
treec285c304760551a8e87cba15bb4c52fb0b567e05
parente33a8f92a4e7f540a47560c32516ab8ebd55e953 (diff)
downloadgcc-2758ce13c10fa263187bfc6acaca0a3eec8a731f.zip
gcc-2758ce13c10fa263187bfc6acaca0a3eec8a731f.tar.gz
gcc-2758ce13c10fa263187bfc6acaca0a3eec8a731f.tar.bz2
Makefile.in: Rebuilt.
* Makefile.in: Rebuilt. * Makefile.am (propdir): New macro. (install-data-local): Install logging.properties. (core_java_source_files): Added java.util.logging.*. * java/util/logging/logging.properties: New file. From-SVN: r73907
-rw-r--r--libjava/ChangeLog8
-rw-r--r--libjava/Makefile.am19
-rw-r--r--libjava/Makefile.in30
-rw-r--r--libjava/java/util/logging/logging.properties8
4 files changed, 65 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9f521ef..383f489 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-24 Tom Tromey <tromey@redhat.com>
+
+ * Makefile.in: Rebuilt.
+ * Makefile.am (propdir): New macro.
+ (install-data-local): Install logging.properties.
+ (core_java_source_files): Added java.util.logging.*.
+ * java/util/logging/logging.properties: New file.
+
2003-11-25 Michael Koch <konqueror@gmx.de>
* java/net/DatagramSocket.java
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 352294a..355527b 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -52,6 +52,8 @@ jar_DATA = libgcj-@gcc_version@.jar
## FIXME: Using libdir violates GNU coding standards.
secdir = $(libdir)/security
+## Where to install default logging property file.
+propdir = $(libdir)
## For now, only on native systems. FIXME.
if NATIVE
@@ -594,6 +596,7 @@ install-data-local:
echo " $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f"; \
$(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f; \
done
+ $(INSTALL_DATA) $(srcdir)/java/util/logging/logging.properties $(DESTDIR)$(propdir)/logging.properties
## ################################################################
@@ -1991,6 +1994,22 @@ java/util/TreeSet.java \
java/util/TooManyListenersException.java \
java/util/Vector.java \
java/util/WeakHashMap.java \
+java/util/logging/ConsoleHandler.java \
+java/util/logging/ErrorManager.java \
+java/util/logging/FileHandler.java \
+java/util/logging/Filter.java \
+java/util/logging/Formatter.java \
+java/util/logging/Handler.java \
+java/util/logging/Level.java \
+java/util/logging/Logger.java \
+java/util/logging/LoggingPermission.java \
+java/util/logging/LogManager.java \
+java/util/logging/LogRecord.java \
+java/util/logging/MemoryHandler.java \
+java/util/logging/SimpleFormatter.java \
+java/util/logging/SocketHandler.java \
+java/util/logging/StreamHandler.java \
+java/util/logging/XMLFormatter.java \
java/util/prefs/NodeChangeListener.java \
java/util/prefs/Preferences.java \
java/util/prefs/PreferenceChangeListener.java \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 34cb413..a0e1f9e 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -180,6 +180,7 @@ jardir = $(datadir)/java
jar_DATA = libgcj-@gcc_version@.jar
secdir = $(libdir)/security
+propdir = $(libdir)
@NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry
@@ -1713,6 +1714,22 @@ java/util/TreeSet.java \
java/util/TooManyListenersException.java \
java/util/Vector.java \
java/util/WeakHashMap.java \
+java/util/logging/ConsoleHandler.java \
+java/util/logging/ErrorManager.java \
+java/util/logging/FileHandler.java \
+java/util/logging/Filter.java \
+java/util/logging/Formatter.java \
+java/util/logging/Handler.java \
+java/util/logging/Level.java \
+java/util/logging/Logger.java \
+java/util/logging/LoggingPermission.java \
+java/util/logging/LogManager.java \
+java/util/logging/LogRecord.java \
+java/util/logging/MemoryHandler.java \
+java/util/logging/SimpleFormatter.java \
+java/util/logging/SocketHandler.java \
+java/util/logging/StreamHandler.java \
+java/util/logging/XMLFormatter.java \
java/util/prefs/NodeChangeListener.java \
java/util/prefs/Preferences.java \
java/util/prefs/PreferenceChangeListener.java \
@@ -3879,6 +3896,18 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/util/jar/JarException.P .deps/java/util/jar/JarFile.P \
.deps/java/util/jar/JarInputStream.P \
.deps/java/util/jar/JarOutputStream.P .deps/java/util/jar/Manifest.P \
+.deps/java/util/logging/ConsoleHandler.P \
+.deps/java/util/logging/ErrorManager.P \
+.deps/java/util/logging/FileHandler.P .deps/java/util/logging/Filter.P \
+.deps/java/util/logging/Formatter.P .deps/java/util/logging/Handler.P \
+.deps/java/util/logging/Level.P .deps/java/util/logging/LogManager.P \
+.deps/java/util/logging/LogRecord.P .deps/java/util/logging/Logger.P \
+.deps/java/util/logging/LoggingPermission.P \
+.deps/java/util/logging/MemoryHandler.P \
+.deps/java/util/logging/SimpleFormatter.P \
+.deps/java/util/logging/SocketHandler.P \
+.deps/java/util/logging/StreamHandler.P \
+.deps/java/util/logging/XMLFormatter.P \
.deps/java/util/natResourceBundle.P .deps/java/util/natTimeZone.P \
.deps/java/util/prefs/AbstractPreferences.P \
.deps/java/util/prefs/BackingStoreException.P \
@@ -5108,6 +5137,7 @@ install-data-local:
echo " $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f"; \
$(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f; \
done
+ $(INSTALL_DATA) $(srcdir)/java/util/logging/logging.properties $(DESTDIR)$(propdir)/logging.properties
maintainer-check: libgcj.la
$(NM) .libs/libgcj.a | grep ' T ' \
diff --git a/libjava/java/util/logging/logging.properties b/libjava/java/util/logging/logging.properties
new file mode 100644
index 0000000..3104af3
--- /dev/null
+++ b/libjava/java/util/logging/logging.properties
@@ -0,0 +1,8 @@
+# Default logging properties.
+# See javadoc in java.util.logging.LogManager to information on
+# overriding these settings. Most of the defaults are compiled in, so
+# this file is fairly minimal.
+
+# Send log records to System.err, default to INFO per documentation.
+handlers = java.util.logging.ConsoleHandler
+.level = INFO