diff options
| author | Matthias Klose <doko@gcc.gnu.org> | 2008-06-28 13:29:13 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2008-06-28 13:29:13 +0000 |
| commit | e0441a5bfb29083a532307ba2b1fd6d6d13944ba (patch) | |
| tree | 602cd7aa7c947386134690d8e0f6b53abcdeacb9 /libjava/classpath/tools | |
| parent | 15c151967dd1cde61b79d26374f608f63a29d411 (diff) | |
| download | gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.zip gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.tar.gz gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.tar.bz2 | |
Import GNU Classpath (classpath-0_97_2-release).
libjava/
2008-06-28 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (classpath-0_97_2-release).
* Regenerate class and header files.
* Regenerate auto* files.
* gcj/javaprims.h: Define jobjectRefType.
* jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
(_Jv_JNIFunctions): Initialize GetObjectRefType.
* gnu/classpath/jdwp/VMVirtualMachine.java,
java/security/VMSecureRandom.java: Merge from classpath.
* HACKING: Fix typo.
* ChangeLog-2007: New file.
* configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.
libjava/classpath/
2008-06-28 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Disable check for JAVAC, when
not configured with --enable-java-maintainer-mode.
* aclocal.m4, configure: Regenerate.
* native/jni/gstreamer-peer/Makefile.am: Do not link with
libclasspathnative.
* native/jni/gstreamer-peer/Makefile.in: Regenerate.
* tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
JCOMPILER, drop flags not understood by gcj.
From-SVN: r137223
Diffstat (limited to 'libjava/classpath/tools')
133 files changed, 1860 insertions, 108 deletions
diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index 773157d..9422827 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -2,23 +2,12 @@ ## GCJ LOCAL: use srcdir to find core classes. GLIBJ_BOOTCLASSPATH='$(top_srcdir)/lib' -GLIBJ_CLASSPATH=$(srcdir)/asm +GLIBJ_CLASSPATH=.:$(srcdir)/asm ## END GCJ LOCAL # Setup the compiler to use the GNU Classpath library we just build -if FOUND_GCJ -JCOMPILER = $(GCJ) -C -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH):. -else -if FOUND_ECJ -JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH) -else -if FOUND_JAVAC -JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH) -else -error dunno how to setup the JCOMPILER and compile -endif # FOUND_JAVAC -endif # FOUND_ECJ -endif # FOUND_GCJ +## GCJ LOCAL: don't pass $(JAVACFLAGS) -source 1.5 -target 1.5 +JCOMPILER = $(JAVAC) -g -w --encoding=UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH) if CREATE_WRAPPERS bin_SCRIPTS = @@ -136,17 +125,35 @@ TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*/*.java \ $(srcdir)/external/asm/org/objectweb/asm/util/attrs/*.java \ $(srcdir)/external/asm/org/objectweb/asm/xml/*.java +# Properties files that must be included in the generated zip file. +PROPERTY_FILES = $(srcdir)/external/asm/org/objectweb/asm/optimizer/shrink.properties \ + $(srcdir)/resource/com/sun/tools/javac/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/jar/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/orbd/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/rmic/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/rmid/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/serialver/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/keytool/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/native2ascii/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/appletviewer/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/common/Messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/getopt/Messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/tnameserv/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/jarsigner/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/rmiregistry/messages.properties \ + $(srcdir)/resource/sun/rmi/rmic/messages.properties + +# RMIC templates that must be included in the generated zip file. +RMIC_TEMPLATES = $(srcdir)/resource/gnu/classpath/tools/rmic/templates/*.jav + # The zip files with classes we want to produce. TOOLS_ZIP = tools.zip # Extra objects that will not exist until configure-time BUILT_SOURCES = $(TOOLS_ZIP) -# RMIC templates that must be included in the generated zip file. -RMIC_TEMPLATES = $(srcdir)/gnu/classpath/tools/rmic/templates/*.jav - # All the files we find "interesting" -ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(RMIC_TEMPLATES) +ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(RMIC_TEMPLATES) $(PROPERTY_FILES) # Some architecture independent data to be installed. # GCJ LOCAL: do not install this. @@ -173,7 +180,7 @@ dist-hook: # the class files. Always regenerate all .class files and remove them # immediately. And copy the template files we use to the classes dir # so they get also included. -$(TOOLS_ZIP): $(TOOLS_JAVA_FILES) +$(TOOLS_ZIP): $(ALL_TOOLS_FILES) ## GCJ LOCAL: put classes in srcdir ## @rm -rf classes asm ## mkdir classes asm @@ -200,14 +207,13 @@ if JAVA_MAINTAINER_MODE $$AC -g -w -d $(srcdir)/asm @asm.lst $(JCOMPILER) -g -w -d $(srcdir)/classes @classes.lst @vm-tools.lst ## Copy over tools resource files. - @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \ - com/sun/javadoc com/sun/tools/doclets com/sun/tools/javac \ - sun/rmi/rmic -name \*.properties -print`; \ + @list=`cd $(srcdir)/resource && find gnu/classpath/tools com/sun/tools/javac \ + sun/rmi/rmic -name \*.properties -print -o -name \*.jav -print`; \ for p in $$list; do \ dirname=classes/`dirname $$p`; \ if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ - echo " cp $(top_srcdir)/resource/$$p classes/$$p"; \ - cp $(top_srcdir)/resource/$$p classes/$$p; \ + echo " cp $(srcdir)resource/$$p classes/$$p"; \ + cp $(srcdir)/resource/$$p classes/$$p; \ done endif ## Copy over rmic template files. @@ -224,12 +230,12 @@ endif ## First add classpath tools stuff. (cd classes; \ if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \ - if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) .; fi; \ + if test "$(FASTJAR)" != ""; then "$(FASTJAR)" cf ../$(TOOLS_ZIP) .; fi; \ cd ..) ## Now add ASM classes. (cd asm; \ if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) .; fi; \ - if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) .; fi; \ + if test "$(FASTJAR)" != ""; then "$(FASTJAR)" uf ../$(TOOLS_ZIP) .; fi; \ cd ..) rm -rf asm classes classes.lst asm.lst diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index 25c56e9..d853d7e 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -65,6 +65,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ $(top_srcdir)/../../ltoptions.m4 \ $(top_srcdir)/../../ltsugar.m4 \ $(top_srcdir)/../../ltversion.m4 \ + $(top_srcdir)/m4/ac_prog_javac.m4 \ + $(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \ @@ -232,7 +234,6 @@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ECJ = @ECJ@ ECJ_JAR = @ECJ_JAR@ EGREP = @EGREP@ ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@ @@ -244,19 +245,8 @@ EXTRA_CFLAGS = @EXTRA_CFLAGS@ FASTJAR = @FASTJAR@ FGREP = @FGREP@ FIND = @FIND@ -FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ -FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@ -FOUND_GCJ_FALSE = @FOUND_GCJ_FALSE@ -FOUND_GCJ_TRUE = @FOUND_GCJ_TRUE@ -FOUND_JAVAC_FALSE = @FOUND_JAVAC_FALSE@ -FOUND_JAVAC_TRUE = @FOUND_JAVAC_TRUE@ -FOUND_JIKES_FALSE = @FOUND_JIKES_FALSE@ -FOUND_JIKES_TRUE = @FOUND_JIKES_TRUE@ -FOUND_KJC_FALSE = @FOUND_KJC_FALSE@ -FOUND_KJC_TRUE = @FOUND_KJC_TRUE@ FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ -GCJ = @GCJ@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_LIBS = @GCONF_LIBS@ GDK_CFLAGS = @GDK_CFLAGS@ @@ -288,15 +278,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JAVAC = @JAVAC@ +JAVAC_MEM_OPT = @JAVAC_MEM_OPT@ JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@ JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@ JAY = @JAY@ JAY_SKELETON = @JAY_SKELETON@ -JIKES = @JIKES@ -JIKESENCODING = @JIKESENCODING@ -JIKESWARNINGS = @JIKESWARNINGS@ -KJC = @KJC@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDEBUG = @LIBDEBUG@ @@ -344,10 +331,8 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRICT_WARNING_CFLAGS = @STRICT_WARNING_CFLAGS@ STRIP = @STRIP@ -USER_CLASSLIB = @USER_CLASSLIB@ +TOOLSDIR = @TOOLSDIR@ USER_JAVAH = @USER_JAVAH@ -USER_SPECIFIED_CLASSLIB_FALSE = @USER_SPECIFIED_CLASSLIB_FALSE@ -USER_SPECIFIED_CLASSLIB_TRUE = @USER_SPECIFIED_CLASSLIB_TRUE@ USE_ESCHER_FALSE = @USE_ESCHER_FALSE@ USE_ESCHER_TRUE = @USE_ESCHER_TRUE@ USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@ @@ -420,12 +405,10 @@ target_vendor = @target_vendor@ toolexeclibdir = @toolexeclibdir@ vm_classes = @vm_classes@ GLIBJ_BOOTCLASSPATH = '$(top_srcdir)/lib' -GLIBJ_CLASSPATH = $(srcdir)/asm -@FOUND_ECJ_FALSE@@FOUND_GCJ_FALSE@@FOUND_JAVAC_TRUE@JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH) -@FOUND_ECJ_TRUE@@FOUND_GCJ_FALSE@JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH) +GLIBJ_CLASSPATH = .:$(srcdir)/asm # Setup the compiler to use the GNU Classpath library we just build -@FOUND_GCJ_TRUE@JCOMPILER = $(GCJ) -C -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH):. +JCOMPILER = $(JAVAC) -g -w --encoding=UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH) @CREATE_WRAPPERS_TRUE@bin_SCRIPTS = @CREATE_WRAPPERS_TRUE@AM_CPPFLAGS = -Wall \ @CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \ @@ -522,17 +505,36 @@ TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*/*.java \ $(srcdir)/external/asm/org/objectweb/asm/xml/*.java +# Properties files that must be included in the generated zip file. +PROPERTY_FILES = $(srcdir)/external/asm/org/objectweb/asm/optimizer/shrink.properties \ + $(srcdir)/resource/com/sun/tools/javac/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/jar/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/orbd/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/rmic/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/rmid/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/serialver/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/keytool/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/native2ascii/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/appletviewer/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/common/Messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/getopt/Messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/tnameserv/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/jarsigner/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/rmiregistry/messages.properties \ + $(srcdir)/resource/sun/rmi/rmic/messages.properties + + +# RMIC templates that must be included in the generated zip file. +RMIC_TEMPLATES = $(srcdir)/resource/gnu/classpath/tools/rmic/templates/*.jav + # The zip files with classes we want to produce. TOOLS_ZIP = tools.zip # Extra objects that will not exist until configure-time BUILT_SOURCES = $(TOOLS_ZIP) -# RMIC templates that must be included in the generated zip file. -RMIC_TEMPLATES = $(srcdir)/gnu/classpath/tools/rmic/templates/*.jav - # All the files we find "interesting" -ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(RMIC_TEMPLATES) +ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(RMIC_TEMPLATES) $(PROPERTY_FILES) # Some architecture independent data to be installed. # GCJ LOCAL: do not install this. @@ -1094,7 +1096,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ pdf pdf-am ps ps-am tags uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am -@FOUND_ECJ_FALSE@@FOUND_GCJ_FALSE@@FOUND_JAVAC_FALSE@error dunno how to setup the JCOMPILER and compile @CREATE_WRAPPERS_FALSE@gappletviewer: gappletviewer.in @CREATE_WRAPPERS_FALSE@gjarsigner: gjarsigner.in @CREATE_WRAPPERS_FALSE@gkeytool: gkeytool.in @@ -1126,7 +1127,7 @@ dist-hook: # the class files. Always regenerate all .class files and remove them # immediately. And copy the template files we use to the classes dir # so they get also included. -$(TOOLS_ZIP): $(TOOLS_JAVA_FILES) +$(TOOLS_ZIP): $(ALL_TOOLS_FILES) find $(srcdir)/external/asm -name '*.java' -print > asm.lst find $(srcdir)/gnu/classpath/tools \ $(srcdir)/com/sun/javadoc \ @@ -1147,14 +1148,13 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES) @JAVA_MAINTAINER_MODE_TRUE@ AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ @JAVA_MAINTAINER_MODE_TRUE@ $$AC -g -w -d $(srcdir)/asm @asm.lst @JAVA_MAINTAINER_MODE_TRUE@ $(JCOMPILER) -g -w -d $(srcdir)/classes @classes.lst @vm-tools.lst -@JAVA_MAINTAINER_MODE_TRUE@ @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \ -@JAVA_MAINTAINER_MODE_TRUE@ com/sun/javadoc com/sun/tools/doclets com/sun/tools/javac \ -@JAVA_MAINTAINER_MODE_TRUE@ sun/rmi/rmic -name \*.properties -print`; \ +@JAVA_MAINTAINER_MODE_TRUE@ @list=`cd $(srcdir)/resource && find gnu/classpath/tools com/sun/tools/javac \ +@JAVA_MAINTAINER_MODE_TRUE@ sun/rmi/rmic -name \*.properties -print -o -name \*.jav -print`; \ @JAVA_MAINTAINER_MODE_TRUE@ for p in $$list; do \ @JAVA_MAINTAINER_MODE_TRUE@ dirname=classes/`dirname $$p`; \ @JAVA_MAINTAINER_MODE_TRUE@ if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ -@JAVA_MAINTAINER_MODE_TRUE@ echo " cp $(top_srcdir)/resource/$$p classes/$$p"; \ -@JAVA_MAINTAINER_MODE_TRUE@ cp $(top_srcdir)/resource/$$p classes/$$p; \ +@JAVA_MAINTAINER_MODE_TRUE@ echo " cp $(srcdir)resource/$$p classes/$$p"; \ +@JAVA_MAINTAINER_MODE_TRUE@ cp $(srcdir)/resource/$$p classes/$$p; \ @JAVA_MAINTAINER_MODE_TRUE@ done @list=`cd $(srcdir) && find gnu/classpath/tools -name \*.jav -print`; \ for p in $$list; do \ @@ -1167,11 +1167,11 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES) cp -pR $(srcdir)/classes . (cd classes; \ if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \ - if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) .; fi; \ + if test "$(FASTJAR)" != ""; then "$(FASTJAR)" cf ../$(TOOLS_ZIP) .; fi; \ cd ..) (cd asm; \ if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) .; fi; \ - if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) .; fi; \ + if test "$(FASTJAR)" != ""; then "$(FASTJAR)" uf ../$(TOOLS_ZIP) .; fi; \ cd ..) rm -rf asm classes classes.lst asm.lst diff --git a/libjava/classpath/tools/classes/com/sun/tools/javac/Main.class b/libjava/classpath/tools/classes/com/sun/tools/javac/Main.class Binary files differindex ac08078..c3b8636 100644 --- a/libjava/classpath/tools/classes/com/sun/tools/javac/Main.class +++ b/libjava/classpath/tools/classes/com/sun/tools/javac/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$1.class Binary files differindex 5b11bc7..be365d4 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$10.class Binary files differindex 9f7dbed..f57650d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$10.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$10.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$2.class Binary files differindex 4fa23ee..ad05cfd 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$3.class Binary files differindex ca776dd..d1d8c3c 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$4.class Binary files differindex 6ac29ce..68b0a10 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$5.class Binary files differindex 6883585..b49c112 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$6.class Binary files differindex d45c2e8..f2b1412 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$7.class Binary files differindex e8e6794..ba6c44c 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$8.class Binary files differindex 801b866..e06bc00 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$9.class Binary files differindex 1dcc16e..0edf26b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main.class Binary files differindex 86e363a..b357b78 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/PluginAppletWindow.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/PluginAppletWindow.class Binary files differindex 3bf54aa..7e71885 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/PluginAppletWindow.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/PluginAppletWindow.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$1.class Binary files differindex cbf44dd..de7dd49 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$2.class Binary files differnew file mode 100644 index 0000000..edb80fb --- /dev/null +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$AtFileArgumentCallback.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$AtFileArgumentCallback.class Binary files differnew file mode 100644 index 0000000..96677cc --- /dev/null +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$AtFileArgumentCallback.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser.class Binary files differindex 59bbaca..36bc25f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/OptionException.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/OptionException.class Binary files differindex 9cc6b62..1f06b6f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/OptionException.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/OptionException.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class Binary files differindex 8a03266..eed1263 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class Binary files differindex 8ed8f98..932b530 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class Binary files differindex 07e4ee7..0d27a4f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class Binary files differindex e131d68..5f86431 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class Binary files differindex dff8052..6d4aa76 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class Binary files differindex 5e1c36e..b05c00b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$7.class Binary files differindex 7dff19b..e507876 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class Binary files differindex 10524df..c8eb12d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniIncludePrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniIncludePrinter.class Binary files differindex 08bcc36..6cbf969 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniIncludePrinter.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniIncludePrinter.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$1.class Binary files differindex b6cf38c..8852210 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$2.class Binary files differindex 1733e76..901cc7b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$3.class Binary files differindex cba7266..1b602fa 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$4.class Binary files differindex d1cdece..8edc8b4 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$5.class Binary files differindex 59015b1..5450d28 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$6.class Binary files differindex 589e70c..d563623 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$7.class Binary files differindex 8a94096..2359cc8 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$8.class Binary files differindex 082d58f..2309169 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$9.class Binary files differindex d64dbd1..b663606 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class Binary files differindex ded3b3a..edd30ed 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class Binary files differindex 690b2b9..ad9a287 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class Binary files differindex 19631e5..0795aca 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class Binary files differindex 9a4ad43..40c1ad4 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class Binary files differindex a26f5f5..fd5942f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class Binary files differindex 5d130e3..327ac9d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class Binary files differindex 039f675..cfdb3b5 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class Binary files differindex 199aea1..8408ea5 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class Binary files differindex b0314c1..c134217 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class Binary files differindex 38f1425..19f5673 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class Binary files differindex 9bff18b..57cff5d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class Binary files differindex 655ed00..f6e8bd1 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class Binary files differindex f85d91f..fdfa2fb 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$1.class Binary files differindex 5a9ea71..1f0d643 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$2.class Binary files differindex 05c3c2f..1dfc79e 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$3.class Binary files differindex f3b5522..89d3cb2 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$4.class Binary files differindex 33d5248..546555b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$5.class Binary files differindex 0c02153..a2e7eee 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main.class Binary files differindex 4fa26d9..f7c264b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class Binary files differindex f79e88c..8877bc5 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class Binary files differindex 61588f5..8d1e58f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class Binary files differindex 038ec53..6212b29 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class Binary files differindex 21be0ab..6f39b37 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class Binary files differindex 40071d8..f542246 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class Binary files differindex b00042c..a558b70 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class Binary files differindex db0a068..6f5febd 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class Binary files differindex 58c55b9..5406d01 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class Binary files differindex 186a954..77d5439 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class Binary files differindex 43a8000..9dd21c2 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class Binary files differindex 1f13243..20029a8 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class Binary files differindex 297717b..73ab89a 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class Binary files differindex 84e2e4a..879fb4c 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class Binary files differindex 7ddc8df..709014c 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class Binary files differindex dfa67eb..75f47e8 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class Binary files differindex b4837a4..643588f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class Binary files differindex 82258e7..71ec9414 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class Binary files differindex 9c116ee..04de1d5c 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class Binary files differindex 0c89c4a..9650d16 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class Binary files differindex b962cb2..2aa7d318 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class Binary files differindex 6185bdd..f715c17 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$1.class Binary files differindex 90aa0dd..6f55542 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$2.class Binary files differindex 6b2b3c9..dcbfbf3 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$3.class Binary files differindex 8344aeb..5e4d671 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$4.class Binary files differindex 9567ff2..67898ec 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$5.class Binary files differindex 1197723..87fa82b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$6.class Binary files differindex 8be88b0..24cefbc 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main.class Binary files differindex a828ac7..5e51a69 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$1.class Binary files differindex 761b86d..269602e 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$2.class Binary files differindex baaa3f5..11e61e6 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main.class Binary files differindex 88c5632..f09eb77 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main.class diff --git a/libjava/classpath/tools/com/sun/tools/javac/Main.java b/libjava/classpath/tools/com/sun/tools/javac/Main.java index f67a2d7..5c5bc2f 100644 --- a/libjava/classpath/tools/com/sun/tools/javac/Main.java +++ b/libjava/classpath/tools/com/sun/tools/javac/Main.java @@ -139,8 +139,11 @@ public class Main new PrintWriter(System.err), Boolean.FALSE }); + String[] runArgs = new String[args.length + 1]; + runArgs[0] = "-1.5"; + System.arraycopy(args, 0, runArgs, 1, args.length); return ((Boolean) ecjMethod.invoke(ecjInstance, new Object[] - { args })).booleanValue() ? 0 : -1; + { runArgs })).booleanValue() ? 0 : -1; } public static int compile(String[] args) throws Exception diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/shrink.properties b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/shrink.properties new file mode 100644 index 0000000..868780b --- /dev/null +++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/shrink.properties @@ -0,0 +1,225 @@ +# class mappings + +#org/objectweb/asm/Edge=org/objectweb/asm/a +#org/objectweb/asm/Item=org/objectweb/asm/b +#org/objectweb/asm/FieldWriter=org/objectweb/asm/c +#org/objectweb/asm/MethodWriter=org/objectweb/asm/d +#org/objectweb/asm/AnnotationWriter=org/objectweb/asm/e + +# field mappings + +org/objectweb/asm/AnnotationWriter.cw=a +org/objectweb/asm/AnnotationWriter.size=b +org/objectweb/asm/AnnotationWriter.named=c +org/objectweb/asm/AnnotationWriter.bv=d +org/objectweb/asm/AnnotationWriter.parent=e +org/objectweb/asm/AnnotationWriter.offset=f +org/objectweb/asm/AnnotationWriter.next=g +org/objectweb/asm/AnnotationWriter.prev=h + +org/objectweb/asm/Attribute.next=a +org/objectweb/asm/Attribute.value=b + +org/objectweb/asm/ByteVector.data=a +org/objectweb/asm/ByteVector.length=b + +org/objectweb/asm/ClassReader.items=a +org/objectweb/asm/ClassReader.strings=c +org/objectweb/asm/ClassReader.maxStringLength=d +#org/objectweb/asm/ClassReader.header=e + +org/objectweb/asm/ClassWriter.TYPE=a +org/objectweb/asm/ClassWriter.version=b +org/objectweb/asm/ClassWriter.index=c +org/objectweb/asm/ClassWriter.pool=d +org/objectweb/asm/ClassWriter.items=e +org/objectweb/asm/ClassWriter.threshold=f +org/objectweb/asm/ClassWriter.key=g +org/objectweb/asm/ClassWriter.key2=h +org/objectweb/asm/ClassWriter.key3=i +org/objectweb/asm/ClassWriter.access=j +org/objectweb/asm/ClassWriter.name=k +org/objectweb/asm/ClassWriter.signature=l +org/objectweb/asm/ClassWriter.superName=m +org/objectweb/asm/ClassWriter.interfaceCount=n +org/objectweb/asm/ClassWriter.interfaces=o +org/objectweb/asm/ClassWriter.sourceFile=p +org/objectweb/asm/ClassWriter.sourceDebug=q +org/objectweb/asm/ClassWriter.enclosingMethodOwner=r +org/objectweb/asm/ClassWriter.enclosingMethod=s +org/objectweb/asm/ClassWriter.anns=t +org/objectweb/asm/ClassWriter.ianns=u +org/objectweb/asm/ClassWriter.attrs=v +org/objectweb/asm/ClassWriter.innerClassesCount=w +org/objectweb/asm/ClassWriter.innerClasses=x +org/objectweb/asm/ClassWriter.firstField=y +org/objectweb/asm/ClassWriter.lastField=z +org/objectweb/asm/ClassWriter.firstMethod=A +org/objectweb/asm/ClassWriter.lastMethod=B +org/objectweb/asm/ClassWriter.computeMaxs=C +org/objectweb/asm/ClassWriter.cr=D + +org/objectweb/asm/Edge.stackSize=a +org/objectweb/asm/Edge.successor=b +org/objectweb/asm/Edge.next=c + +org/objectweb/asm/Handler.start=a +org/objectweb/asm/Handler.end=b +org/objectweb/asm/Handler.handler=c +org/objectweb/asm/Handler.desc=d +org/objectweb/asm/Handler.type=e +org/objectweb/asm/Handler.next=f + +org/objectweb/asm/FieldWriter.next=a +org/objectweb/asm/FieldWriter.cw=b +org/objectweb/asm/FieldWriter.access=c +org/objectweb/asm/FieldWriter.name=d +org/objectweb/asm/FieldWriter.desc=e +org/objectweb/asm/FieldWriter.signature=f +org/objectweb/asm/FieldWriter.value=g +org/objectweb/asm/FieldWriter.anns=h +org/objectweb/asm/FieldWriter.ianns=i +org/objectweb/asm/FieldWriter.attrs=j + +org/objectweb/asm/Item.index=a +org/objectweb/asm/Item.type=b +org/objectweb/asm/Item.intVal=c +org/objectweb/asm/Item.longVal=d +org/objectweb/asm/Item.floatVal=e +org/objectweb/asm/Item.doubleVal=f +org/objectweb/asm/Item.strVal1=g +org/objectweb/asm/Item.strVal2=h +org/objectweb/asm/Item.strVal3=i +org/objectweb/asm/Item.hashCode=j +org/objectweb/asm/Item.next=k + +org/objectweb/asm/Label.resolved=a +org/objectweb/asm/Label.position=b +org/objectweb/asm/Label.resized=c +org/objectweb/asm/Label.referenceCount=d +org/objectweb/asm/Label.srcAndRefPositions=e +org/objectweb/asm/Label.beginStackSize=f +org/objectweb/asm/Label.maxStackSize=g +org/objectweb/asm/Label.successors=h +org/objectweb/asm/Label.next=i +org/objectweb/asm/Label.pushed=j +org/objectweb/asm/Label.line=k + +org/objectweb/asm/MethodWriter.next=a +org/objectweb/asm/MethodWriter.cw=b +org/objectweb/asm/MethodWriter.access=c +org/objectweb/asm/MethodWriter.name=d +org/objectweb/asm/MethodWriter.desc=e +org/objectweb/asm/MethodWriter.descriptor=f +org/objectweb/asm/MethodWriter.signature=g +org/objectweb/asm/MethodWriter.exceptionCount=h +org/objectweb/asm/MethodWriter.exceptions=i +org/objectweb/asm/MethodWriter.annd=j +org/objectweb/asm/MethodWriter.anns=k +org/objectweb/asm/MethodWriter.ianns=l +org/objectweb/asm/MethodWriter.panns=m +org/objectweb/asm/MethodWriter.ipanns=n +org/objectweb/asm/MethodWriter.attrs=o +org/objectweb/asm/MethodWriter.code=p +org/objectweb/asm/MethodWriter.maxStack=q +org/objectweb/asm/MethodWriter.maxLocals=r +org/objectweb/asm/MethodWriter.catchCount=s +org/objectweb/asm/MethodWriter.catchTable=t +org/objectweb/asm/MethodWriter.localVarCount=u +org/objectweb/asm/MethodWriter.localVar=v +org/objectweb/asm/MethodWriter.localVarTypeCount=w +org/objectweb/asm/MethodWriter.localVarType=x +org/objectweb/asm/MethodWriter.lineNumberCount=y +org/objectweb/asm/MethodWriter.lineNumber=z +org/objectweb/asm/MethodWriter.cattrs=A +org/objectweb/asm/MethodWriter.resize=B +org/objectweb/asm/MethodWriter.computeMaxs=C +org/objectweb/asm/MethodWriter.stackSize=D +org/objectweb/asm/MethodWriter.maxStackSize=E +org/objectweb/asm/MethodWriter.currentBlock=F +org/objectweb/asm/MethodWriter.blockStack=G +org/objectweb/asm/MethodWriter.SIZE=H +org/objectweb/asm/MethodWriter.classReaderOffset=I +org/objectweb/asm/MethodWriter.classReaderLength=J +org/objectweb/asm/MethodWriter.lastHandler=K + +org/objectweb/asm/Type.sort=a +org/objectweb/asm/Type.buf=b +org/objectweb/asm/Type.off=c +org/objectweb/asm/Type.len=d + +org/objectweb/asm/signature/SignatureReader.signature=a + +org/objectweb/asm/signature/SignatureWriter.buf=a +org/objectweb/asm/signature/SignatureWriter.hasFormals=b +org/objectweb/asm/signature/SignatureWriter.hasParameters=c +org/objectweb/asm/signature/SignatureWriter.argumentStack=d + +# method mappings + +org/objectweb/asm/AnnotationWriter.getSize()I=a +org/objectweb/asm/AnnotationWriter.put([Lorg/objectweb/asm/AnnotationWriter;Lorg/objectweb/asm/ByteVector;)V=a +org/objectweb/asm/AnnotationWriter.put(Lorg/objectweb/asm/ByteVector;)V=a + +org/objectweb/asm/Attribute.getCount()I=a +org/objectweb/asm/Attribute.getSize(Lorg/objectweb/asm/ClassWriter;[BIII)I=a +org/objectweb/asm/Attribute.put(Lorg/objectweb/asm/ClassWriter;[BIIILorg/objectweb/asm/ByteVector;)V=a + +org/objectweb/asm/ByteVector.enlarge(I)V=a +org/objectweb/asm/ByteVector.put11(II)Lorg/objectweb/asm/ByteVector;=a +org/objectweb/asm/ByteVector.put12(II)Lorg/objectweb/asm/ByteVector;=b + +org/objectweb/asm/ClassReader.copyPool(Lorg/objectweb/asm/ClassWriter;)V=a +org/objectweb/asm/ClassReader.readAnnotationValue(I[CLjava/lang/String;Lorg/objectweb/asm/AnnotationVisitor;)I=a +org/objectweb/asm/ClassReader.readAnnotationValues(I[CLorg/objectweb/asm/AnnotationVisitor;)I=a +org/objectweb/asm/ClassReader.readAttribute([Lorg/objectweb/asm/Attribute;Ljava/lang/String;II[CI[Lorg/objectweb/asm/Label;)Lorg/objectweb/asm/Attribute;=a +org/objectweb/asm/ClassReader.readClass(Ljava/io/InputStream;)[B=a +org/objectweb/asm/ClassReader.readParameterAnnotations(I[CZLorg/objectweb/asm/MethodVisitor;)V=a +org/objectweb/asm/ClassReader.readUTF(II[C)Ljava/lang/String;=a + +org/objectweb/asm/ClassWriter.get(Lorg/objectweb/asm/Item;)Lorg/objectweb/asm/Item;=a +org/objectweb/asm/ClassWriter.newClassItem(Ljava/lang/String;)Lorg/objectweb/asm/Item;=a +org/objectweb/asm/ClassWriter.newConstItem(Ljava/lang/Object;)Lorg/objectweb/asm/Item;=a +org/objectweb/asm/ClassWriter.newDouble(D)Lorg/objectweb/asm/Item;=a +org/objectweb/asm/ClassWriter.newFloat(F)Lorg/objectweb/asm/Item;=a +org/objectweb/asm/ClassWriter.newInteger(I)Lorg/objectweb/asm/Item;=a +org/objectweb/asm/ClassWriter.newLong(J)Lorg/objectweb/asm/Item;=a +org/objectweb/asm/ClassWriter.newMethodItem(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lorg/objectweb/asm/Item;=a +org/objectweb/asm/ClassWriter.newString(Ljava/lang/String;)Lorg/objectweb/asm/Item;=b +org/objectweb/asm/ClassWriter.put122(III)V=a +org/objectweb/asm/ClassWriter.put(Lorg/objectweb/asm/Item;)V=b + +org/objectweb/asm/FieldWriter.getSize()I=a +org/objectweb/asm/FieldWriter.put(Lorg/objectweb/asm/ByteVector;)V=a + +org/objectweb/asm/Item.isEqualTo(Lorg/objectweb/asm/Item;)Z=a +org/objectweb/asm/Item.set(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=a +org/objectweb/asm/Item.set(D)V=a +org/objectweb/asm/Item.set(F)V=a +org/objectweb/asm/Item.set(I)V=a +org/objectweb/asm/Item.set(J)V=a + +org/objectweb/asm/Label.addReference(II)V=a +org/objectweb/asm/Label.put(Lorg/objectweb/asm/MethodWriter;Lorg/objectweb/asm/ByteVector;IZ)V=a +org/objectweb/asm/Label.resolve(Lorg/objectweb/asm/MethodWriter;I[B)Z=a + +org/objectweb/asm/MethodWriter.addSuccessor(ILorg/objectweb/asm/Label;)V=a +org/objectweb/asm/MethodWriter.getArgumentsAndReturnSizes(Ljava/lang/String;)I=a +org/objectweb/asm/MethodWriter.getNewOffset([I[III)I=a +org/objectweb/asm/MethodWriter.getSize()I=a +org/objectweb/asm/MethodWriter.put(Lorg/objectweb/asm/ByteVector;)V=a +org/objectweb/asm/MethodWriter.readInt([BI)I=a +org/objectweb/asm/MethodWriter.readShort([BI)S=b +org/objectweb/asm/MethodWriter.readUnsignedShort([BI)I=c +org/objectweb/asm/MethodWriter.resizeInstructions([I[II)[I=a +org/objectweb/asm/MethodWriter.writeShort([BII)V=a +org/objectweb/asm/MethodWriter.getNewOffset([I[ILorg/objectweb/asm/Label;)V=a + +org/objectweb/asm/Type.getType([CI)Lorg/objectweb/asm/Type;=a +org/objectweb/asm/Type.getDescriptor(Ljava/lang/StringBuffer;)V=a +org/objectweb/asm/Type.getDescriptor(Ljava/lang/StringBuffer;Ljava/lang/Class;)V=a + +org/objectweb/asm/signature/SignatureReader.parseType(Ljava/lang/String;ILorg/objectweb/asm/signature/SignatureVisitor;)I=a + +org/objectweb/asm/signature/SignatureWriter.endFormals()V=a +org/objectweb/asm/signature/SignatureWriter.endArguments()V=b diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java index c41ac1d..24b305a 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java +++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java @@ -113,7 +113,7 @@ class CommonAppletStub */ public String getParameter(String name) { - return (String) tag.getParameter(name.toLowerCase()); + return tag.getParameter(name.toLowerCase()); } /** diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/Main.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/Main.java index a10b889..4eff8f5 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/Main.java @@ -55,7 +55,6 @@ import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.ResourceBundle; class Main diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java index 283d547..bcf5780 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java +++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java @@ -61,8 +61,6 @@ import java.net.URL; import java.util.ArrayList; import java.util.HashMap; -import javax.swing.JOptionPane; - class PluginAppletWindow extends EmbeddedWindow @@ -350,7 +348,7 @@ class PluginAppletWindow * Called when the hierarchy of this component changes. Use * <code>getChangeFlags()</code> on the event to see what exactly changed. * - * @param e the event describing the change + * @param event the event describing the change */ public void hierarchyChanged(HierarchyEvent event) { diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java index 3a0a442..b92dc50 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java +++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java @@ -512,7 +512,7 @@ class StandaloneAppletWindow * Called when the hierarchy of this component changes. Use * <code>getChangeFlags()</code> on the event to see what exactly changed. * - * @param e the event describing the change + * @param event the event describing the change */ public void hierarchyChanged(HierarchyEvent event) { diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java index 56bb1bb..c1e5cac 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java +++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java @@ -292,7 +292,7 @@ public class TagParser /** * Parses the archive string and returns a list. * - * @param the list of archives (comma-separated) in a String. + * @param arcs the list of archives (comma-separated) in a String. */ static ArrayList parseArchives(String arcs, AppletTag t) { diff --git a/libjava/classpath/tools/gnu/classpath/tools/common/ClasspathToolParser.java b/libjava/classpath/tools/gnu/classpath/tools/common/ClasspathToolParser.java index e44b901..b2e5087 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/common/ClasspathToolParser.java +++ b/libjava/classpath/tools/gnu/classpath/tools/common/ClasspathToolParser.java @@ -38,9 +38,16 @@ exception statement from your version. */ package gnu.classpath.tools.common; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.Reader; import java.text.MessageFormat; +import java.util.ArrayList; import gnu.classpath.Configuration; +import gnu.classpath.tools.getopt.FileArgumentCallback; import gnu.classpath.tools.getopt.Option; import gnu.classpath.tools.getopt.OptionException; import gnu.classpath.tools.getopt.Parser; @@ -84,4 +91,149 @@ public class ClasspathToolParser } }); } + + public void parse(String[] inArgs, FileArgumentCallback files, + boolean handleFileLists) + { + FileArgumentCallback cb; + + if (handleFileLists) + cb = new AtFileArgumentCallback(files); + else + cb = files; + + parse(inArgs, cb); + } + + public String[] parse(String[] inArgs, boolean handleFileLists) + { + final ArrayList<String> fileResult = new ArrayList<String>(); + + final FileArgumentCallback cb = new FileArgumentCallback() + { + public void notifyFile(String fileArgument) + { + fileResult.add(fileArgument); + } + }; + + if (handleFileLists) + parse(inArgs, new AtFileArgumentCallback(cb)); + else + parse(inArgs, cb); + + return fileResult.toArray(new String[fileResult.size()]); + } + + + /** + * Simple function that takes the given {@link Reader}, treats it like + * a textfile and reads all the whitespace separated entries from it + * and adds them to the @{link FileArgumentCallback} instance. + * + * @param reader the reader to read from. + * @param cb the callback to post the filenames to. + * @throws OptionException if an error occurs reading the list. + */ + public void parseFileList(Reader reader, FileArgumentCallback cb) + throws OptionException + { + BufferedReader breader = new BufferedReader(reader); + String line = null; + + try + { + while ((line = breader.readLine()) != null) + parseLine(line, cb); + + reader.close(); + } + catch (IOException ioe) + { + throw new OptionException("I/O error while reading a file list", ioe); + } + + } + + /** + * Parses whitespace separated file entries. + * + * Note: This is not coping with whitespace in files or quoting. + * + * @param line the line of the file to parse. + * @param cb the callback to pass the parsed file to. + * @throws IOException if an I/O error occurs. + * @throws OptionException if an error occurs in the callback. + */ + private void parseLine(String line, FileArgumentCallback cb) + throws IOException, OptionException + { + final int length = line.length(); + int start = 0; + int end = 0; + + // While not reached end of line ... + while (start < length) + { + // Search for first non-whitespace character for the start of a word. + while (Character.isWhitespace(line.codePointAt(start))) + { + start++; + + if (start == length) + return; + } + + end = start + 1; + + // Search for first whitespace character for the end of a word. + while (end < length && !Character.isWhitespace(line.codePointAt(end))) + end++; + + cb.notifyFile(line.substring(start, end)); + + start = end + 1; + } + } + + /** + * Implementation of {@link FileArgumentCallback} that handles + * file arguments in {@link #notifyFile} starting with a <code>@</code> + * through {@link ClasspathToolParser#parseFileList}. + */ + class AtFileArgumentCallback extends FileArgumentCallback + { + FileArgumentCallback cb; + + AtFileArgumentCallback(FileArgumentCallback cb) + { + this.cb = cb; + } + + @Override + public void notifyFile(String fileArgument) + throws OptionException + { + if (fileArgument.codePointAt(0) == '@') + { + FileReader fr = null; + + try + { + fr = new FileReader(fileArgument.substring(1)); + } + catch (FileNotFoundException fnfe) + { + throw new OptionException("File not found: " + fileArgument.substring(1), + fnfe); + } + + ClasspathToolParser.this.parseFileList(fr, cb); + } + else + cb.notifyFile(fileArgument); + } + + } + } diff --git a/libjava/classpath/tools/gnu/classpath/tools/getopt/OptionException.java b/libjava/classpath/tools/gnu/classpath/tools/getopt/OptionException.java index a09d716..2d7f77a 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/getopt/OptionException.java +++ b/libjava/classpath/tools/gnu/classpath/tools/getopt/OptionException.java @@ -49,4 +49,10 @@ public class OptionException { super(message); } + + public OptionException(String message, Throwable cause) + { + super(message, cause); + } + } diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java b/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java index d52028f..e5f1a3f 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java @@ -172,9 +172,9 @@ public class Main } } - private Parser initializeParser() + private ClasspathToolParser initializeParser() { - Parser p = new JarParser("jar"); //$NON-NLS-1$ + ClasspathToolParser p = new JarParser("jar"); //$NON-NLS-1$ p.setHeader(Messages.getString("Main.Usage")); //$NON-NLS-1$ OptionGroup grp = new OptionGroup(Messages.getString("Main.OpMode")); //$NON-NLS-1$ @@ -265,11 +265,11 @@ public class Main private void run(String[] args) throws InstantiationException, IllegalAccessException, IOException { - Parser p = initializeParser(); + ClasspathToolParser p = initializeParser(); // Special hack to emulate old tar-style commands. if (args.length > 0 && args[0].charAt(0) != '-') args[0] = '-' + args[0]; - p.parse(args, new HandleFile()); + p.parse(args, new HandleFile(), true); if (readNamesFromStdin) readNames(); Action t = (Action) operationMode.newInstance(); diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/CniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/CniIncludePrinter.java index 445f902..8861541 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/CniIncludePrinter.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/CniIncludePrinter.java @@ -63,14 +63,14 @@ public class CniIncludePrinter return new PrintStream(fos); } - public void printClass(File filename, ClassWrapper klass) throws IOException + public void printClass(File file, ClassWrapper klass) throws IOException { // Never write Object or Class. This is a hack, maybe // the user would like to see what they look like... if (klass.name.equals("java/lang/Object") || klass.name.equals("java/lang/Class")) return; - PrintStream ps = getPrintStream(filename + ".h", klass); + PrintStream ps = getPrintStream(file + ".h", klass); if (ps == null) return; ps.println(); diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java b/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java index 7faed16..15bcec2 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java @@ -38,10 +38,11 @@ package gnu.classpath.tools.javah; +import gnu.classpath.tools.common.ClasspathToolParser; + import gnu.classpath.tools.getopt.Option; import gnu.classpath.tools.getopt.OptionException; import gnu.classpath.tools.getopt.OptionGroup; -import gnu.classpath.tools.getopt.Parser; import java.io.IOException; import java.util.ArrayList; @@ -60,9 +61,9 @@ public class GcjhMain extends Main return "gcjh"; } - protected Parser getParser() + protected ClasspathToolParser getParser() { - Parser result = super.getParser(); + ClasspathToolParser result = super.getParser(); result.setHeader("usage: gcjh [OPTION]... CLASS..."); diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java index 6c1a8e1..ba44a57 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java @@ -107,15 +107,23 @@ public class JniIncludePrinter return new JniPrintStream(classpath, fos, klass); } - public void printClass(File filename, ClassWrapper klass) throws IOException + public void printClass(File file, ClassWrapper klass) throws IOException { // Note that we ignore the filename here. String xname = JniHelper.mangle(klass.name); - JniPrintStream out - = (JniPrintStream) getPrintStream(klass.name.replace('/', '_') + ".h", - klass); + + // mangle the filename a bit + String filename = klass.name; + + filename = filename.replace('/', '_'); + filename = filename.replace('$', '_'); + filename = filename + ".h"; + + JniPrintStream out = (JniPrintStream) getPrintStream(filename, klass); + if (out == null) return; + out.println(); out.print("#ifndef __"); out.print(xname); diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java index 29c96cf..bfca444 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java @@ -188,7 +188,7 @@ public class Main return "javah"; } - protected Parser getParser() + protected ClasspathToolParser getParser() { ClasspathToolParser result = new ClasspathToolParser(getName(), true); result.setHeader("usage: javah [OPTIONS] CLASS..."); @@ -324,11 +324,11 @@ public class Main while (i.hasNext()) { Map.Entry e = (Map.Entry) i.next(); - File filename = (File) e.getKey(); + File file = (File) e.getKey(); ClassWrapper klass = (ClassWrapper) e.getValue(); if (verbose) - System.err.println("[writing " + klass + " as " + filename + "]"); - printer.printClass(filename, klass); + System.err.println("[writing " + klass + " as " + file + "]"); + printer.printClass(file, klass); } } @@ -339,8 +339,8 @@ public class Main protected void run(String[] args) throws IOException { - Parser p = getParser(); - String[] classNames = p.parse(args); + ClasspathToolParser p = getParser(); + String[] classNames = p.parse(args, true); postParse(classNames); loader = classpath.getLoader(); diff --git a/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java b/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java index 0667bef..6bf3193 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java +++ b/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java @@ -101,7 +101,7 @@ public class Native2ASCII encoding = argument; } }); - result.add(new Option("reverse", Messages.getString("Native2ASCII.ReversedHelp")) //$NON-NLS-1$ //$NON-NLS-2$ + result.add(new Option("reverse", Messages.getString("Native2ASCII.ReverseHelp")) //$NON-NLS-1$ //$NON-NLS-2$ { public void parsed(String argument) throws OptionException { diff --git a/libjava/classpath/tools/gnu/classpath/tools/orbd/Main.java b/libjava/classpath/tools/gnu/classpath/tools/orbd/Main.java index afb30ad..15f3612 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/orbd/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/orbd/Main.java @@ -41,10 +41,8 @@ import gnu.CORBA.OrbFunctional; import gnu.CORBA.IOR; import gnu.CORBA.NamingService.Ext; import gnu.classpath.tools.common.ClasspathToolParser; -import gnu.classpath.tools.getopt.FileArgumentCallback; import gnu.classpath.tools.getopt.Option; import gnu.classpath.tools.getopt.OptionException; -import gnu.classpath.tools.getopt.OptionGroup; import gnu.classpath.tools.getopt.Parser; import org.omg.CosNaming.NamingContextExt; diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java index 9c50efa..e853a5a 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java @@ -22,15 +22,11 @@ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA package gnu.classpath.tools.rmic; import gnu.java.rmi.server.RMIHashes; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; import java.io.File; import java.io.FileOutputStream; -import java.io.FileWriter; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import java.io.PrintWriter; import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; @@ -46,13 +42,10 @@ import java.rmi.server.RemoteRef; import java.rmi.server.RemoteStub; import java.rmi.server.Skeleton; import java.rmi.server.SkeletonMismatchException; -import java.security.MessageDigest; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Set; import java.util.StringTokenizer; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassWriter; diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/Main.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/Main.java index 12d1fa2..28f4d19 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/Main.java @@ -22,16 +22,10 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA package gnu.classpath.tools.rmic; import gnu.classpath.tools.common.ClasspathToolParser; -import gnu.classpath.tools.getopt.FileArgumentCallback; import gnu.classpath.tools.getopt.Option; import gnu.classpath.tools.getopt.OptionException; -import gnu.classpath.tools.getopt.OptionGroup; import gnu.classpath.tools.getopt.Parser; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; import java.util.ArrayList; /** diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmid/Main.java b/libjava/classpath/tools/gnu/classpath/tools/rmid/Main.java index d601b13..4ee079c 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmid/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmid/Main.java @@ -39,7 +39,6 @@ package gnu.classpath.tools.rmid; import gnu.classpath.tools.rmid.ActivationSystemImpl; import gnu.classpath.tools.common.ClasspathToolParser; -import gnu.classpath.tools.getopt.FileArgumentCallback; import gnu.classpath.tools.getopt.Option; import gnu.classpath.tools.getopt.OptionException; import gnu.classpath.tools.getopt.OptionGroup; diff --git a/libjava/classpath/tools/gnu/classpath/tools/tnameserv/Main.java b/libjava/classpath/tools/gnu/classpath/tools/tnameserv/Main.java index 460b781..78a8f98 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/tnameserv/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/tnameserv/Main.java @@ -39,10 +39,8 @@ package gnu.classpath.tools.tnameserv; import gnu.CORBA.NamingService.NamingServiceTransient; import gnu.classpath.tools.common.ClasspathToolParser; -import gnu.classpath.tools.getopt.FileArgumentCallback; import gnu.classpath.tools.getopt.Option; import gnu.classpath.tools.getopt.OptionException; -import gnu.classpath.tools.getopt.OptionGroup; import gnu.classpath.tools.getopt.Parser; /** diff --git a/libjava/classpath/tools/resource/com/sun/tools/javac/messages.properties b/libjava/classpath/tools/resource/com/sun/tools/javac/messages.properties new file mode 100644 index 0000000..995e871 --- /dev/null +++ b/libjava/classpath/tools/resource/com/sun/tools/javac/messages.properties @@ -0,0 +1,42 @@ +# messages.properties -- English language messages +# Copyright (C) 2007 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +Main.FailedToRead:failed to read ecj.jar (reconfigure with --with-ecj-jar): {0} +Main.MalformedURL:malformed URL for ecj.jar: {0} +Main.FailedToLoad:failed to load {0} from ecj.jar: {1} +Main.FailedConstructor:failed to find ecj constructor +Main.FailedCompile:failed to find ecj compile method diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/appletviewer/messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/appletviewer/messages.properties new file mode 100644 index 0000000..c826afa --- /dev/null +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/appletviewer/messages.properties @@ -0,0 +1,102 @@ +# messages.properties -- English language messages +# Copyright (C) 2004, 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +Main.ErrorApplet=An error occurred while loading this applet. +Main.Usage=Usage: appletviewer [OPTION] -code CODE | URL... +Main.AppletTagOptions=Applet tag options +Main.CodeDescription=specify the code attribute +Main.CodeArgument=CODE +Main.CodebaseDescription=specify the codebase attribute +Main.CodebaseArgument=CODEBASE +Main.ArchiveDescription=specify the archive attribute +Main.ArchiveArgument=ARCHIVE +Main.WidthDescription=specify the width attribute +Main.WidthArgument=WIDTH +Main.HeightDescription=specify the height attribute +Main.HeightArgument=HEIGHT +Main.ParamDescription=specify the parameter arguments +Main.ParamArgument=NAME,VALUE +Main.PluginOption=Plugin option +Main.PluginDescription=enable plugin mode +Main.PluginArgument=INPUT,OUTPUT +Main.DebuggingOption=Debugging option +Main.VerboseDescription=enable verbose mode +Main.CompatibilityOptions=Compatibility options +Main.DebugDescription=enable debugging mode (not implemented) +Main.EncodingDescription=specify the HTML character encoding +Main.EncodingArgument=CHARSET +Main.SecurityWarning=WARNING: CURRENTLY GAPPLETVIEWER RUNS WITH NO\ + SECURITY MANAGER.\n\ +THIS MEANS THAT APPLETS YOU LOAD CAN DO ANYTHING A JAVA APPLICATION\n\ +THAT YOU DOWNLOAD AND RUN CAN DO. BE *VERY* CAREFUL WHICH APPLETS YOU RUN.\n\ +DO NOT USE GAPPLETVIEWER ON YOUR SYSTEM IF YOUR SYSTEM STORES IMPORTANT\ + DATA.\n\ +THIS DATA CAN BE DESTROYED OR STOLEN IF YOU LOAD A MALICIOUS APPLET. +Main.ContinuationPrompt=[press 'c' or 'C' to continue or anything else to quit] +Main.NoInputFiles=appletviewer: no input files +Main.RawArguments=Raw arguments: + +PluginAppletViewer.AppletViewerWrote=PIPE: applet viewer wrote: +PluginAppletViewer.AppletViewerRead=PIPE: applet viewer read: +PluginAppletViewer.AppletViewerExiting=appletviewer: exiting plugin applet\ + viewer + +StandaloneAppletContext.ShowDocumentError=showDocument is not implemented in\ + standalone mode + +StandaloneAppletViewer.ParsedAppletTags=Parsed applet tags: +StandaloneAppletViewer.Tag=tag +StandaloneAppletViewer.CodeOptionError=appletviewer: option '--code' requires\ + a class filename + +StandaloneAppletWindow.MenuTitle=Applet +StandaloneAppletWindow.MenuReload=Reload +StandaloneAppletWindow.MenuRestart=Restart +StandaloneAppletWindow.MenuStart=Start +StandaloneAppletWindow.MenuStop=Stop +StandaloneAppletWindow.MenuClone=Clone ... +StandaloneAppletWindow.MenuQuit=Quit +StandaloneAppletWindow.MenuClose=Close +StandaloneAppletWindow.MenuTag=Tag ... +StandaloneAppletWindow.MenuInfo=Info ... +StandaloneAppletWindow.MenuEdit=Edit +StandaloneAppletWindow.MenuEncoding=Character Encoding +StandaloneAppletWindow.MenuPrint=Print ... +StandaloneAppletWindow.MenuProperties=Properties ... +StandaloneAppletWindow.MenuCancel=Cancel +StandaloneAppletWindow.MenuSave=Save ... +StandaloneAppletWindow.WindowTitle=GNU Classpath Applet Viewer: diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/common/Messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/common/Messages.properties new file mode 100644 index 0000000..989fde7 --- /dev/null +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/common/Messages.properties @@ -0,0 +1,40 @@ +# MessagesBundle.properties -- English language messages +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +ClasspathToolParser.JArgument=pass argument to the Java runtime +ClasspathToolParser.JName=OPTION +ClasspathToolParser.VersionFormat={0} (GNU Classpath) {1}\n\nCopyright 2006 Free Software Foundation, Inc.\nThis is free software; see the source for copying conditions. There is NO\nwarranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/getopt/Messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/getopt/Messages.properties new file mode 100644 index 0000000..a747ab4 --- /dev/null +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/getopt/Messages.properties @@ -0,0 +1,46 @@ +# MessagesBundle.properties -- English language messages +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +Parser.StdOptions=Standard options +Parser.PrintHelp=print this help, then exit +Parser.PrintVersion=print version number, then exit +Parser.ArgReqd=option ''{0}'' requires an argument +Parser.Unrecognized=unrecognized option ''{0}'' +Parser.NoArg=option ''{0}'' doesn''t allow an argument +Parser.UnrecDash=unrecognized option ''-{0}'' +Parser.TryHelpShort=Try ''{0} -help'' for more information +Parser.TryHelpLong=Try ''{0} --help'' for more information diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/jar/messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/jar/messages.properties new file mode 100644 index 0000000..a456fe2 --- /dev/null +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/jar/messages.properties @@ -0,0 +1,72 @@ +# messages.properties -- English language messages +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +Creator.Ignoring=ignoring entry {0} +Creator.Adding=adding: {0} (in={1,number,integer}) (out={2,number,integer}) (stored {3,number,integer}%) +Extractor.Created=\ \ created: {0} +Extractor.Extracted=\ extracted: {0} +Extractor.Inflated=\ \ inflated: {0} +Indexer.Indexing=indexing: {0} +Main.ArchiveAlreadySet=archive file name already set to {0} +Main.ModeAlreaySet=operation mode already specified +Main.MustSpecify=must specify one of -t, -c, -u, -x, or -i +Main.TwoArgsReqd=-C argument requires both directory and filename +Main.CantHaveBoth=can't specify both -m and -M +Main.NoFilesWithi=can't specify file arguments when using -i +Main.NoMAndi=can't specify -M with -i +Main.AnotherNomAndi=can't specify -m with -i +Main.Usage=Usage: jar -ctxui [OPTIONS] jar-file [-C DIR FILE] FILE... +Main.OpMode=Operation mode +Main.Create=create a new archive +Main.Extract=extract from archive +Main.List=list archive contents +Main.Update=update archive +Main.Index=compute archive index +Main.FileArg=FILE +Main.OpMods=Operation modifiers +Main.ArchiveName=specify archive file name +Main.FileArg2=FILE +Main.NoZip=store only; no ZIP compression +Main.Verbose=verbose operation +Main.NoManifest=do not create a manifest file +Main.ManifestName=specify manifest file +Main.ManifestArgName=FILE +Main.FileNameGroup=File name selection +Main.ChangeDir=change to directory before the next file +Main.ChangeDirArg=DIR FILE +Main.InternalError=jar: internal error: +Main.Stdin=Read file names from stdin diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/jarsigner/messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/jarsigner/messages.properties new file mode 100644 index 0000000..d408817 --- /dev/null +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/jarsigner/messages.properties @@ -0,0 +1,126 @@ +# messages.properties -- English language messages and message formats +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. +# +# for gnu.classpath.tools.jarsigner package +# + +Main.7=jarsigner: +Main.9=jarsigner error: +Main.70=JAR file [{0}] is NOT a file object +Main.72=JAR file [{0}] is NOT readable +#Main.85=Option '-keystore' is not defined or is an empty string, and 'user.home' is unknown +Main.85=Unable to locate a valid key store +Main.92=Enter key store password: +Main.6=Designated alias [{0}] MUST be known to the key store in use +Main.2=\ +Usage: jarsigner [OPTION]... FILE ALIAS\n\ +\ \ \ \ \ \ \ \ jarsigner -verify [OPTION]... FILE\n\ +Java ARchive (JAR) file signing and verification tool.\n\ +\n\ +FILE is the .JAR file to sign or to verify.\n\ +\n\ +ALIAS must be a known Alias of a Key Entry in the designated key store. The \ +private key material associated with this Alias is used for signing FILE. if \ +ALIAS is required, but was omitted, "mykey" will be used instead. +Main.1=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +Main.0=Signing options +Main.95=Designated alias [{0}] MUST be an Alias of a Key Entry +Main.97=Enter key password for <{0}>: +Main.99=Key associated with [{0}] MUST be a private key +Main.101=Location of the key store to use. The default value is a file-based \ +scheme whose path is the file named ".keystore" in your home directory.\n\ +If URL is malformed, the tool will use URL as a file-name of a key store; \ +i.e. as if the protocol was "file:". +Main.102=URL +Main.104=Type of the key store to use. If omitted, the default value is that \ +of the property "keystore.type" in the security properties file. +Main.105=STORE_TYPE +Main.107=Password to unlock the key store. If omitted, you will be prompted \ +to provide a password. +Main.108=PASSWORD +Main.110=Password to unlock the Key Entry associated with ALIAS. If omitted, \ +the tool will use the same password protecting the key store. If this fails, \ +you will be prompted to provide a password. +Main.111=PASSWORD +Main.113=A literal to construct file names for both the .SF and .DSA signature \ +files --which will be placed in the META-INF directory of the signed JAR. \ +Permissible characters are in the range [a-zA-Z0-9_-].\n\ +If omitted, the first 8 characters of ALIAS will be used. Characters outside \ +that range will be replaced by underscores. +Main.114=NAME +Main.116=Name of the signed JAR file. If omitted, the signed JAR will be \ +named the same as FILE; i.e. the input file will be replaced with its signed \ +copy. +Main.117=FILE +Main.118=Verification options +Main.120=Verify an already signed FILE. +Main.122=Use with -verbose to see more detailed information about the \ +certificates of ALIAS. +Main.123=Common options +Main.125=Output more verbose messages during processing. +Main.127=Include --otherwise do not-- the .SF file in the .DSA generated file. +Main.129=Include in the .SF generated file --otherwise do not-- a header \ +containing a hash of the whole manifest file. +Main.131=Fully qualified class name of a Security Provider to add to the JVM \ +in-use. +Main.132=PROVIDER_CLASS_NAME +Main.133=Missing FILE argument. + +JarSigner.1=\ \ signing: +JarSigner.2=\ updating: +JarSigner.8=\ \ \ adding: +JarSigner.14=Jar signed. + +JarVerifier.2=Jar is not signed --no signature files found. +JarVerifier.3=Jar verification failed. +JarVerifier.4=Jar partially verified --{0,numer} of {1,number} signers. +JarVerifier.7=Jar verified --{0,number} signer(s). +JarVerifier.13=Signature Block missing for {0} +JarVerifier.14=At least one SignerInfo element MUST be present in a Signature \ +Block (.DSA file) +JarVerifier.16=Missing EncryptedDigest in Signature Block (.DSA file) first \ +SignerInfo element + +SFHelper.1=Helper is NOT finished +SFHelper.4=.SF file has NOT been generated +SFHelper.6=Unknown or unsupported private key algorithm +SFHelper.9=Helper is NOT ready +SFHelper.0=Warning: The certificate issued by {0}, for {1}, has expired as of {3,date,full} - {3,time,full}. +SFHelper.10=Helper is NOT started +SFHelper.11=Warning: The certificate issued by {0}, for {1}, is only valid after {3,date,full} - {3,time,full}. +SFHelper.14=[unknown] +SFHelper.17=[unnamed] diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/keytool/messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/keytool/messages.properties new file mode 100644 index 0000000..98f4e68 --- /dev/null +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/keytool/messages.properties @@ -0,0 +1,570 @@ +# messages.properties -- English language messages and message formats +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. +# +# for gnu.classpath.tools.keytool package +# + +Main.6=keytool: {0} +Main.8=keytool error: {0} +Main.5=Import a CA's Trusted Certificate.\n\ +[-file FILE] [-storetype STORE_TYPE] [-keystore URL]\n\ +[-storepass PASSWORD] [-provider PROVIDER_CLASS_NAME] [-v]. +Main.18=Unrecognized command: {0} +Main.19=Usage: keytool [COMMAND] [-- COMMAND]...\n\ +Manage private keys and public certificates. +Main.20=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +Main.21=Available commands +Main.22=Generate a Key Entry, eventually creating a key store.\n\ +[-alias ALIAS] [-keyalg ALGORITHM] [-keysize KEY_SIZE]\n\ +[-sigalg ALGORITHM] [-dname NAME] [-keypass PASSWORD]\n\ +[-validity DAY_COUNT] [-storetype STORE_TYPE]\n\ +[-keystore URL] [-storepass PASSWORD]\n\ +[-provider PROVIDER_CLASS_NAME] [-v]. +Main.23=Add Key Entries and Trusted Certificates.\n\ +[-alias ALIAS] [-file FILE] [-keypass PASSWORD]\n\ +[-noprompt] [-trustcacerts] [-storetype STORE_TYPE]\n\ +[-keystore URL] [-storepass PASSWORD]\n\ +[-provider PROVIDER_CLASS_NAME] [-v]. +Main.24=Generate a self-signed Trusted Certificate.\n\ +[-alias ALIAS] [-sigalg ALGORITHM] [-dname NAME]\n\ +[-validity DAY_COUNT] [-keypass PASSWORD]\n\ +[-storetype STORE_TYPE] [-keystore URL]\n\ +[-storepass PASSWORD] [-provider PROVIDER_CLASS_NAME] [-v]. +Main.25=NOT IMPLEMENTED YET. Import JDK1.1 Identity Database.\n\ +[-file FILE] [-storetype STORE_TYPE] [-keystore URL]\n\ +[-storepass PASSWORD] [-provider PROVIDER_CLASS_NAME] [-v]. +Main.26=Issue a Certificate Signing Request (CSR).\n\ +[-alias ALIAS] [-sigalg ALGORITHM] [-file FILE]\n\ +[-keypass PASSWORD] [-storetype STORE_TYPE] [-keystore URL]\n\ +[-storepass PASSWORD] [-provider PROVIDER_CLASS_NAME] [-v]\n\ +[-attributes]. +Main.27=Export a Certificate from a key store.\n\ +[-alias ALIAS] [-file FILE] [-storetype STORE_TYPE]\n\ +[-keystore URL] [-storepass PASSWORD]\n\ +[-provider PROVIDER_CLASS_NAME] [-rfc] [-v]. +Main.28=Print one or all Certificates in a key store to STDOUT.\n\ +[-alias ALIAS] [-storetype STORE_TYPE] [-keystore URL]\n\ +[-storepass PASSWORD] [-provider PROVIDER_CLASS_NAME] [-rfc] [-v]. +Main.29=Print a human-readable form of a Certificate in a FILE.\n\ +[-file FILE] [-v]. +Main.30=Clone a Key Entry in a key store.\n\ +[-alias ALIAS] [-dest ALIAS] [-keypass PASSWORD]\n\ +[-new PASSWORD] [-storetype STORE_TYPE] [-keystore URL]\n\ +[-storepass PASSWORD] [-provider PROVIDER_CLASS_NAME] [-v]. +Main.31=Change the password protecting a key store.\n\ +[-new PASSWORD] [-storetype STORE_TYPE] [-keystore URL]\n\ +[-storepass PASSWORD] [-provider PROVIDER_CLASS_NAME] [-v]. +Main.32=Change the password protecting a Key Entry in a key store.\n\ +[-alias ALIAS] [-keypass PASSWORD] [-new PASSWORD]\n\ +[-storetype STORE_TYPE] [-keystore URL]\n\ +[-storepass PASSWORD] [-provider PROVIDER_CLASS_NAME] [-v]. +Main.33=Delete a Key Entry or a Trusted Certificate from a key store.\n\ +[-alias ALIAS] [-storetype STORE_TYPE] [-keystore URL]\n\ +[-storepass PASSWORD] [-provider PROVIDER_CLASS_NAME] [-v]. + +Command.19=Failed creating new file at {0} +Command.20=Unable to find a suitable signature algorithm named {0}, although we found a key-pair generation algorithm named {1} +Command.21=Enter key password for <{0}>: +Command.23=A correct key password MUST be provided +Command.24=Enter key store password: +#Command.36=Option '-keystore' is undefined, or is an empty string, and 'user.home' is unknown +Command.36=Unable to locate a valid key store +Command.40=Provider fully qualified class name: +Command.42=File object [{0}] exists but is NOT a file +Command.44=File [{0}] exists but is NOT writable +Command.46=File object [{0}] MUST be an existing readable file +Command.48=Signature algorithm is missing and private key is of unknown or unsupported type +Command.51=Validity period MUST be greater than zero +Command.52=Unable to get signature algorithm name +Command.60=Unknown or unsupported signature algorithm: {0} +Command.63=Saving key store at {0} +Command.66=Owner: {0} +Command.67=Issuer: {0} +Command.68=Serial number: {0,number} +Command.69=Valid from: {0,date,full} - {0,time,full} +Command.70=\ \ \ \ \ until: {0,date,full} - {0,time,full} +Command.71=Certificate fingerprints +Command.72=\ \ \ \ \ \ MD5: {0} +Command.73=\ \ SHA-160: {0} +Command.75=Alias [{0}] MUST be knwon to the key store +Command.77=Alias [{0}] MUST be associated with a Key Entry + +CertReqCmd.27=Certification request stored in {0} +CertReqCmd.28=Submit this to your CA +CertReqCmd.25=Usage: keytool -certreq [OPTION]...\n\ +Generate a PKCS#10 Certificate Signing Request (CSR) and write it to a \ +designated output destination.\n\n\ +IMPORTANT: Some documentation claims that the Attributes field, in the CSR is \ +OPTIONAL while RFC-2986 implies the opposite. This implementation considers \ +this field, by default, as OPTIONAL, unless option -attributes is specified. +CertReqCmd.24=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +CertReqCmd.23=Command options +CertReqCmd.22=Alias of an entry in the key store on whose behalf the CSR is \ +generated. The value "mykey" (all lower case, without the enclosing quotes) \ +is used when this option is omitted. +CertReqCmd.21=ALIAS +CertReqCmd.20=Name of the digital signature algorithm to use for signing the \ +certificate. If omitted, a default value is chosen based on the type of the \ +private key associated with ALIAS. If the key is a "DSA" one, the value for \ +signature algorithm will be "SHA1withDSA". If on the other hand the key is \ +an "RSA" one, then "MD5withRSA" will be the signature algorithm. +CertReqCmd.19=ALGORITHM +CertReqCmd.18=Destination of the generated CSR. STDOUT is used if this \ +option is omitted. +CertReqCmd.17=FILE +CertReqCmd.16=Password to unlock the Key Entry associated with ALIAS. If \ +omitted, the tool will attempt to unlock the Key Entry using the same password \ +protecting the key store. If this fails, you will be prompted for a password. +CertReqCmd.14=Type of the key store to use. If omitted, the default value is \ +that of the property "keystore.type" in the security properties file. +CertReqCmd.13=STORE_TYPE +CertReqCmd.12=Location of the key store to use. The default value is a \ +file-based scheme whose path is the file named ".keystore" in your home \ +directory.\n\ +If URL is malformed, the tool will use URL as a file-name of a key store; \ +i.e. as if the protocol was "file:". +CertReqCmd.11=URL +CertReqCmd.10=Password to unlock the key store. If omitted, you will be \ +prompted for one. +CertReqCmd.9=PASSWORD +CertReqCmd.8=Fully qualified class name of a Security Provider to add to the \ +JVM in-use. +CertReqCmd.7=PROVIDER_CLASS_NAME +CertReqCmd.6=Emit more verbose messages. +CertReqCmd.5=Force the tool to encode a NULL DER value in the CSR as the value \ +of the Attributes field. + +DeleteCmd.19=Enter the Alias to delete: +DeleteCmd.18=Usage: keytool -delete [OPTION]...\n\ +Delete a designated key store entry. +DeleteCmd.17=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +DeleteCmd.16=Command options +DeleteCmd.15=Alias of an entry to delete. The value "mykey" (all lower case, \ +without the enclosing quotes) is used when this option is omitted. +DeleteCmd.14=ALIAS +DeleteCmd.13=Type of the key store to use. If omitted, the default value is \ +that of the property "keystore.type" in the security properties file. +DeleteCmd.12=STORE_TYPE +DeleteCmd.11=Location of the key store to use. The default value is a \ +file-based scheme whose path is the file named ".keystore" in your home \ +directory.\n\ +If URL is malformed, the tool will use URL as a file-name of a key store; \ +i.e. as if the protocol was "file:". +DeleteCmd.10=URL +DeleteCmd.20=Alias MUST NOT be null or an empty string +DeleteCmd.9=Password to unlock the key store. If omitted, you will be \ +prompted for one. +DeleteCmd.8=PASSWORD +DeleteCmd.7=Fully qualified class name of a Security Provider to add to the \ +JVM in-use. +DeleteCmd.6=PROVIDER_CLASS_NAME +DeleteCmd.5=Emit more verbose messages. + +GenKeyCmd.0=\nYou are about to enter information that will be incorporated into\n\ +your certificate request. This information is what is called a\n\ +Distinguished Name or DN. There are quite a few fields but you\n\ +can use supplied default values, displayed between brackets, by just\n\ +hitting <Enter>, or blank the field by entering the <.> character\n\ +before hitting <Enter>.\n\n +GenKeyCmd.6=The Sample Company +GenKeyCmd.7=Sydney +GenKeyCmd.8=NSW +GenKeyCmd.9=AU +GenKeyCmd.10=Common Name (hostname, IP, or your name): +GenKeyCmd.11=Organization Name (company) [{0}]: +GenKeyCmd.13=Organizational Unit Name (department, division): +GenKeyCmd.14=Locality Name (city, district) [{0}]: +GenKeyCmd.16=State or Province Name (full name) [{0}]: +GenKeyCmd.18=Country Name (2 letter code) [{0}]: +GenKeyCmd.54=Key size MUST be greater than zero +GenKeyCmd.57=Usage: keytool -genkey [OPTION]...\n\ +Generate a new key-pair and save these credentials in the key store as a Key \ +Entry, associated with a designated Alias. +GenKeyCmd.58=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +GenKeyCmd.59=Command options +GenKeyCmd.60=Alias of the Key Entry to generate. The value "mykey" (all lower \ +case, without the enclosing quotes) is used when this option is omitted. +GenKeyCmd.61=ALIAS +GenKeyCmd.62=Name of the key-pair generation algorithm. The default value is \ +"DSS" (a synonym for the Digital Signature Algorithm also known as DSA). +GenKeyCmd.63=ALGORITHM +GenKeyCmd.64=Number of bits of the shared modulus, for both the public and \ +private keys, to use for the new keys. If omitted, 1024 is used. +GenKeyCmd.65=SIZE +GenKeyCmd.66=Name of the digital signature algorithm to use for signing the \ +certificate. If omitted, a default value is chosen based on the type of the \ +private key associated with ALIAS. If the key is a "DSA" one, the value for \ +signature algorithm will be "SHA1withDSA". If on the other hand the key is \ +an "RSA" one, then "MD5withRSA" will be the signature algorithm. +GenKeyCmd.68=The X.500 Distinguished Name of the Subject of the generated \ +certificate. If omitted you will be prompted for one. +GenKeyCmd.69=NAME +GenKeyCmd.70=Password to protect the newly created Key Entry. If omitted, \ +you will be prompted to provide a password. +GenKeyCmd.71=PASSWORD +GenKeyCmd.72=Number of days the generated certificate is valid for. If \ +omitted, 90 is used. +GenKeyCmd.73=DAY_COUNT +GenKeyCmd.74=Type of the key store to use. If omitted, the default value is \ +that of the property "keystore.type" in the security properties file. +GenKeyCmd.75=STORE_TYPE +GenKeyCmd.76=Location of the key store to use. The default value is a \ +file-based scheme whose path is the file named ".keystore" in your home \ +directory.\n\ +If URL is malformed, the tool will use URL as a file-name of a key store; \ +i.e. as if the protocol was "file:". +GenKeyCmd.77=URL +GenKeyCmd.78=Password to unlock the key store. If omitted, you will be \ +prompted for one. +GenKeyCmd.80=Fully qualified class name of a Security Provider to add to the \ +JVM in-use. +GenKeyCmd.81=PROVIDER_CLASS_NAME +GenKeyCmd.82=Emit more verbose messages. + +StorePasswdCmd.19=Too many failed attempts +StorePasswdCmd.18=Usage: keytool -storepasswd [OPTION]...\n\ +Change the password protecting a key store. +StorePasswdCmd.17=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +StorePasswdCmd.16=Command options +StorePasswdCmd.15=The new, and different, password to protect the key store. \ +If omitted, you will be prompted for one. +StorePasswdCmd.13=Type of the key store to use. If omitted, the default value is \ +that of the property "keystore.type" in the security properties file. +StorePasswdCmd.12=STORE_TYPE +StorePasswdCmd.11=Location of the key store to use. The default value is a \ +file-based scheme whose path is the file named ".keystore" in your home \ +directory.\n\ +If URL is malformed, the tool will use URL as a file-name of a key store; \ +i.e. as if the protocol was "file:". +StorePasswdCmd.10=URL +StorePasswdCmd.20=Enter new key store password: +StorePasswdCmd.21=Password MUST be at least 6 characters. +StorePasswdCmd.22=New password MUST be different than the old one. +StorePasswdCmd.23=Re-enter new key store password: +StorePasswdCmd.24=Passwords MUST be the same in both attempts. +StorePasswdCmd.9=Password to unlock the key store. If omitted, you will be \ +prompted for one. +StorePasswdCmd.8=PASSWORD +StorePasswdCmd.7=Fully qualified class name of a Security Provider to add to the \ +JVM in-use. +StorePasswdCmd.6=PROVIDER_CLASS_NAME +StorePasswdCmd.5=Emit more verbose messages. + +KeyPasswdCmd.24=Enter new key password for <{0}>: +KeyPasswdCmd.28=Re-enter new key password for <{0}>: +KeyPasswdCmd.23=Usage: keytool -keypasswd [OPTION]...\n\ +Change the password protecting a Key Entry. +KeyPasswdCmd.22=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +KeyPasswdCmd.21=Command options +KeyPasswdCmd.20=The Alias which password is to be changed. +KeyPasswdCmd.19=ALIAS +KeyPasswdCmd.18=Password to unlock ALIAS. If omitted, the tool will attempt \ +to unlock the Key Entry using the same password protecting the key store. If \ +this fails, you will be prompted for a password. +KeyPasswdCmd.16=The new, and different, password to protect ALIAS. +KeyPasswdCmd.14=Type of the key store to use. If omitted, the default value is \ +that of the property "keystore.type" in the security properties file. +KeyPasswdCmd.13=STORE_TYPE +KeyPasswdCmd.12=Location of the key store to use. The default value is a \ +file-based scheme whose path is the file named ".keystore" in your home \ +directory.\n\ +If URL is malformed, the tool will use URL as a file-name of a key store; \ +i.e. as if the protocol was "file:". +KeyPasswdCmd.11=URL +KeyPasswdCmd.10=Password to unlock the key store. If omitted, you will be \ +prompted for one. +KeyPasswdCmd.9=PASSWORD +KeyPasswdCmd.8=Fully qualified class name of a Security Provider to add to the \ +JVM in-use. +KeyPasswdCmd.7=PROVIDER_CLASS_NAME +KeyPasswdCmd.6=Emit more verbose messages. + +KeyCloneCmd.23=Destination Alias MUST NOT exist in key store +KeyCloneCmd.26=Enter destination alias: +KeyCloneCmd.27=Destination alias MUST NOT be null nor empty +KeyCloneCmd.28=Enter new key password for <{0}> [{1}]: +KeyCloneCmd.22=Usage: keytool -keyclone [OPTION]...\n\ +Clone an existing Key Entry and store it under a new (different) Alias \ +protecting its private key material with possibly a new password. +KeyCloneCmd.21=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +KeyCloneCmd.20=Command options +KeyCloneCmd.19=Alias of an entry to clone. The value "mykey" (all lower case, \ +without the enclosing quotes) is used when this option is omitted. +KeyCloneCmd.17=Alias to identify the cloned copy of the Key Entry. +KeyCloneCmd.16=ALIAS +KeyCloneCmd.15=Password to unlock the Key Entry associated with the Alias to \ +clone. If omitted, the tool will attempt to unlock the Key Entry using the \ +same password protecting the key store. If this fails, you will be prompted \ +for a password. +KeyCloneCmd.13=Password to protect the cloned copy of the Key Entry. If \ +omitted, you will be prompted to provide one. +KeyCloneCmd.11=Type of the key store to use. If omitted, the default value is \ +that of the property "keystore.type" in the security properties file. +KeyCloneCmd.10=STORE_TYPE +KeyCloneCmd.9=Location of the key store to use. The default value is a \ +file-based scheme whose path is the file named ".keystore" in your home \ +directory.\n\ +If URL is malformed, the tool will use URL as a file-name of a key store; \ +i.e. as if the protocol was "file:". +KeyCloneCmd.8=URL +KeyCloneCmd.7=Password to unlock the key store. If omitted, you will be \ +prompted for one. +KeyCloneCmd.6=PASSWORD +KeyCloneCmd.5=Fully qualified class name of a Security Provider to add to the \ +JVM in-use. +KeyCloneCmd.4=PROVIDER_CLASS_NAME +KeyCloneCmd.3=Emit more verbose messages. + +ListCmd.21=Key store type: {0} +ListCmd.22=Key store provider: {0} +ListCmd.24=Key store contains {0,number} entry(ies) +ListCmd.20=Usage: keytool -list [OPTION]...\n\ +Print one or all of the key store entries to STDOUT. Usually this command \ +will only print a fingerprint of the certificate, unless either -rfc or -v \ +is specified. +ListCmd.30=Alias name: {0} +ListCmd.31=Creation timestamp: {0,date,full} - {0,time,full} +ListCmd.32=Entry type: trusted-certificate +ListCmd.33=Entry type: key-entry +ListCmd.34=Alias [{0}] is unknown to the key store +ListCmd.38=Certificate chain length: {0,number} +ListCmd.39=Certificate[1]: +ListCmd.40=Certificate[{0,number}]: +ListCmd.42=******************************************* +ListCmd.43=-----BEGIN CERTIFICATE----- +ListCmd.44=-----END CERTIFICATE----- +ListCmd.45=Certificate fingerprint (MD5): {0} +ListCmd.19=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +ListCmd.18=Command options +ListCmd.17=Alias of an entry to list. If omitted, all entries are listed. +ListCmd.16=ALIAS +ListCmd.15=Type of the key store to use. If omitted, the default value is \ +that of the property "keystore.type" in the security properties file. +ListCmd.14=STORE_TYPE +ListCmd.13=Location of the key store to use. The default value is a \ +file-based scheme whose path is the file named ".keystore" in your home \ +directory.\n\ +If URL is malformed, the tool will use URL as a file-name of a key store; \ +i.e. as if the protocol was "file:". +ListCmd.12=URL +ListCmd.11=Password to unlock the key store. If omitted, you will be \ +prompted for one. +ListCmd.10=PASSWORD +ListCmd.9=Fully qualified class name of a Security Provider to add to the \ +JVM in-use. +ListCmd.8=PROVIDER_CLASS_NAME +ListCmd.7=Output the certificate in human-readable format, even if -rfc is \ +also specified. +ListCmd.6=Use RFC-1421 specifications when encoding the output. + +ImportCmd.34=Failed to establish chain-of-trust from reply +ImportCmd.37=Unable to find anchor certificate for {0} +ImportCmd.38=Public keys, in key store and certificate, MUST be of the same type +ImportCmd.32=Can this certificate be trusted? +ImportCmd.40=Key entry associated with {0} has an unknown or unsupported public key type {1} +ImportCmd.41=Public keys, in key store and certificate, MUST be the same +ImportCmd.29=Certificate was added to the key store +ImportCmd.28=Certificate was not added to the key store +ImportCmd.27=Usage: keytool -import [OPTION]...\n\ +Read an X.509 certificate, or a PKCS#7 Certificate Reply from a designated \ +input source and incorporate the certificates into the key store. +ImportCmd.26=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +ImportCmd.25=Command options +ImportCmd.24=If ALIAS does not already exist in the key store, the tool treats \ +the certificate in FILE as a new Trusted Certificate.\n\ +If ALIAS exists in the key store, the tool will treat the certificate(s) in \ +FILE as a Certificate Reply (which can be a chain of certificates). +ImportCmd.23=ALIAS +ImportCmd.22=Location of the Certificate or Certificate Reply to import. +ImportCmd.21=FILE +ImportCmd.20=Password to protect the Key Entry associated with ALIAS. If \ +this option is omitted, and the chain-of-trust for the Certificate Reply has \ +been established, the tool will first attempt to unlock the Key Entry using \ +the same password protecting the key store. If this fails, you will be \ +prompted to provide a password. +ImportCmd.19=PASSWORD +ImportCmd.18=Prevent the tool from prompting the user. +ImportCmd.17=Additionally use a key store, of type "JKS", named "cacerts", \ +and located in lib/security in an installed Java Runtime Environment, when \ +trying to establish chains-of-trust. +ImportCmd.16=Type of the key store to use. If omitted, the default value is \ +that of the property "keystore.type" in the security properties file. +ImportCmd.15=STORE_TYPE +ImportCmd.14=Location of the key store to use. The default value is a \ +file-based scheme whose path is the file named ".keystore" in your home \ +directory.\n\ +If URL is malformed, the tool will use URL as a file-name of a key store; \ +i.e. as if the protocol was "file:". +ImportCmd.13=URL +ImportCmd.12=Password to unlock the key store. If omitted, you will be \ +prompted for one. +ImportCmd.11=PASSWORD +ImportCmd.10=Fully qualified class name of a Security Provider to add to the \ +JVM in-use. +ImportCmd.9=PROVIDER_CLASS_NAME +ImportCmd.8=Emit more verbose messages. +ImportCmd.7=Was unable to build a certificate-chain. Only {0,number} out of {1,number} certificates were processed + +ExportCmd.17=Usage: keytool -export [OPTION]...\n\ +Export a certificate stored in the key store to a designated output \ +destination, either in binary format or in RFC-1421 compliant encoding. +ExportCmd.18=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +ExportCmd.19=Command options +ExportCmd.20=Alias of an entry to export. The value "mykey" (all lower case, \ +without the enclosing quotes) is used when this option is omitted. +ExportCmd.21=ALIAS +ExportCmd.22=Destination of the exported certificate. STDOUT is used if this \ +option is omitted. +ExportCmd.23=FILE +ExportCmd.24=Type of the key store to use. If omitted, the default value is \ +that of the property "keystore.type" in the security properties file. +ExportCmd.25=STORE_TYPE +ExportCmd.26=Location of the key store to use. The default value is a \ +file-based scheme whose path is the file named ".keystore" in your home \ +directory.\n\ +If URL is malformed, the tool will use URL as a file-name of a key store; \ +i.e. as if the protocol was "file:". +ExportCmd.27=URL +ExportCmd.28=Password to unlock the key store. If omitted, you will be \ +prompted for one. +ExportCmd.29=PASSWORD +ExportCmd.30=Fully qualified class name of a Security Provider to add to the \ +JVM in-use. +ExportCmd.31=PROVIDER_CLASS_NAME +ExportCmd.32=Use RFC-1421 specifications when encoding the output. +ExportCmd.33=Output the certificate in binary DER encoding, which is the \ +default format. If -rfc is also present, this option is ignored. + +IdentityDBCmd.7=Usage: keytool -identitydb [OPTION]...\n\ +NOT IMPLEMENTED YET. Import a JDK 1.1 style Identity Database. +IdentityDBCmd.8=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +IdentityDBCmd.9=Command options +IdentityDBCmd.10=Location of the Identity Database to import. If omitted, \ +STDIN is used. +IdentityDBCmd.11=FILE +IdentityDBCmd.12=Type of the key store to use. If omitted, the default value is \ +that of the property "keystore.type" in the security properties file. +IdentityDBCmd.13=STORE_TYPE +IdentityDBCmd.14=Location of the key store to use. The default value is a \ +file-based scheme whose path is the file named ".keystore" in your home \ +directory.\n\ +If URL is malformed, the tool will use URL as a file-name of a key store; \ +i.e. as if the protocol was "file:". +IdentityDBCmd.15=URL +IdentityDBCmd.16=Password to unlock the key store. If omitted, you will be \ +prompted for one. +IdentityDBCmd.17=PASSWORD +IdentityDBCmd.18=Fully qualified class name of a Security Provider to add to the \ +JVM in-use. +IdentityDBCmd.19=PROVIDER_CLASS_NAME +IdentityDBCmd.20=Emit more verbose messages. + +PrintCertCmd.5=Usage: keytool -printcert [OPTION]...\n\ +Read a certificate from FILE and print it to STDOUT in a human-readable form. +PrintCertCmd.6=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +PrintCertCmd.7=Command options +PrintCertCmd.8=Location of the certificate to print. If omitted, STDIN is used. +PrintCertCmd.9=FILE +PrintCertCmd.10=Emit more verbose messages. + +SelfCertCmd.14=Usage: keytool -selfcert [OPTION]...\n\ +Generate a self-signed X.509 version 1 certificate.\n\n\ +The newly generated certificate will form a chain of one element which will \ +replace the previous chain associated with ALIAS. +SelfCertCmd.15=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +SelfCertCmd.16=Command options +SelfCertCmd.17=Alias of the Key Entry to select. The value "mykey" (all lower \ +case, without the enclosing quotes) is used when this option is omitted. +SelfCertCmd.18=ALIAS +SelfCertCmd.19=Name of the digital signature algorithm to use for signing the \ +certificate. If omitted, a default value is chosen based on the type of the \ +private key associated with ALIAS. If the key is a "DSA" one, the value for \ +signature algorithm will be "SHA1withDSA". If on the other hand the key is \ +an "RSA" one, then "MD5withRSA" will be the signature algorithm. +SelfCertCmd.20=ALGORITHM +SelfCertCmd.21=The X.500 Distinguished Name of the Subject of the generated \ +certificate. If omitted the Distinguished Name of the base certificate in \ +the chain associated with ALIAS is used instead. +SelfCertCmd.22=NAME +SelfCertCmd.23=Password to unlock the Key Entry associated with ALIAS. If \ +omitted, the tool will attempt to unlock the Key Entry using the same password \ +protecting the key store. If this fails, you will be prompted for a password. +SelfCertCmd.24=PASSWORD +SelfCertCmd.25=Number of days the generated certificate is valid for. If \ +omitted, 90 is used. +SelfCertCmd.26=DAY_COUNT +SelfCertCmd.27=Type of the key store to use. If omitted, the default value is \ +that of the property "keystore.type" in the security properties file. +SelfCertCmd.28=STORE_TYPE +SelfCertCmd.29=Location of the key store to use. The default value is a \ +file-based scheme whose path is the file named ".keystore" in your home \ +directory.\n\ +If URL is malformed, the tool will use URL as a file-name of a key store; \ +i.e. as if the protocol was "file:". +SelfCertCmd.30=URL +SelfCertCmd.31=Password to unlock the key store. If omitted, you will be \ +prompted for one. +SelfCertCmd.32=PASSWORD +SelfCertCmd.33=Fully qualified class name of a Security Provider to add to the \ +JVM in-use. +SelfCertCmd.34=PROVIDER_CLASS_NAME +SelfCertCmd.35=Emit more verbose messages. + +CACertCmd.0=Alias [{0}] is already present in key store +CACertCmd.1=Certificate in file "{0}" was added to the key store under the alias "{1}" +CACertCmd.2=Usage: keytool -cacert [OPTION]...\n\ +Import a trusted CA certificate. +CACertCmd.3=Please report bugs at http://www.gnu.org/software/classpath/bugs.html +CACertCmd.4=Command options +CACertCmd.5=Location of the trusted CA certificate to import. +CACertCmd.6=FILE +CACertCmd.7=Type of the key store to use. If omitted, the default value is \ +that of the property "keystore.type" in the security properties file. +CACertCmd.8=STORE_TYPE +CACertCmd.9=Location of the key store to use. The default value is a \ +file-based scheme whose path is the file named ".keystore" in your home \ +directory.\n\ +If URL is malformed, the tool will use URL as a file-name of a key store; \ +i.e. as if the protocol was "file:". +CACertCmd.10=URL +CACertCmd.11=Password to unlock the key store. If omitted, you will be \ +prompted for one. +CACertCmd.12=PASSWORD +CACertCmd.13=Fully qualified class name of a Security Provider to add to the \ +JVM in-use. +CACertCmd.14=PROVIDER_CLASS_NAME +CACertCmd.15=Emit more verbose messages. diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/native2ascii/messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/native2ascii/messages.properties new file mode 100644 index 0000000..f04d184 --- /dev/null +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/native2ascii/messages.properties @@ -0,0 +1,44 @@ +# messages.properties -- English language messages +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +Native2ASCII.TooManyFiles=too many files specified +Native2ASCII.Usage=Usage: native2ascii [OPTIONS]... [INPUTFILE [OUTPUTFILE]] +Native2ASCII.EncodingHelp=encoding to use +Native2ASCII.EncodingArgName=NAME +Native2ASCII.EncodingSpecified=encoding already specified +Native2ASCII.ReverseHelp=convert from encoding to native + diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/orbd/messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/orbd/messages.properties new file mode 100644 index 0000000..b427d10 --- /dev/null +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/orbd/messages.properties @@ -0,0 +1,46 @@ +# messages.properties -- English language messages +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +Main.Usage=Usage: orbd [OPTIONS] +Main.ORBInitialPort=port on which persistent naming service is to be started +Main.Port=PORT +Main.IOR=file in which to store persistent naming service's IOR reference +Main.IORFile=FILE +Main.Restart=restart persistent naming service, clearing persistent naming database +Main.Directory=directory in which to store persistent data +Main.DirectoryArgument=DIRECTORY +Main.InternalError=orbd: internal error: diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/messages.properties new file mode 100644 index 0000000..7be7cb0 --- /dev/null +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/messages.properties @@ -0,0 +1,61 @@ +# messages.properties -- English language messages +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +Main.Usage:rmic [OPTIONS] CLASSNAME... +Main.NoWarn:show no warnings +Main.NoWrite:check for errors and do not write any files +Main.Verbose:show verbose output +Main.DirOpt:write generated files to given directory +Main.DirArg:DIRECTORY +Main.ClasspathOpt:where to find input classes +Main.ClasspathArg:PATH +Main.BootclasspathOpt:where to find classes used to run rmic (ignored) +Main.BootclasspathArg:PATH +Main.ExtdirsOpt:where to find extension classes used to run rmic (ignored) +Main.ExtdirsArg:PATH +Main.IIOP:generate stubs and ties for IIOP +Main.Always:always overwrite generated files (ignored) +Main.AlwaysGenerate:same as -always +Main.NoLocalStubs:do not create same-process stubs (ignored) +Main.POA:generate servant-based ties +Main.Keep:keep generated stub, skeleton and tie sources +Main.KeepGenerated:same as -keep +Main.v11:generate JDK 1.1 protocol stubs and skeletons +Main.v12:generate JDK 1.2 JRMP stubs (default) +Main.vcompat:generate JDK 1.1 protocol and JDK 1.2 JRMP stubs +Main.DebugInfo:include debugging information in generated classes +Main.InternalError:rmic: internal error: diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/ImplTie.jav b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/ImplTie.jav index aff606b..aff606b 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/ImplTie.jav +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/ImplTie.jav diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/Stub.jav b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/Stub.jav index 371e12d..371e12d 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/Stub.jav +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/Stub.jav diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/StubMethod.jav b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/StubMethod.jav index 17636de..17636de 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/StubMethod.jav +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/StubMethod.jav diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/StubMethodVoid.jav b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/StubMethodVoid.jav index 0125a02..0125a02 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/StubMethodVoid.jav +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/StubMethodVoid.jav diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/Stub_12.jav b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/Stub_12.jav index 1c55a05..1c55a05 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/Stub_12.jav +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/Stub_12.jav diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/Stub_12Method.jav b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/Stub_12Method.jav index 9aaf8f5..9aaf8f5 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/Stub_12Method.jav +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/Stub_12Method.jav diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/Stub_12MethodVoid.jav b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/Stub_12MethodVoid.jav index 860a93c..860a93c 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/Stub_12MethodVoid.jav +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/Stub_12MethodVoid.jav diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/Tie.jav b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/Tie.jav index 797ae14..797ae14 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/Tie.jav +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/Tie.jav diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/TieMethod.jav b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/TieMethod.jav index 493f000..493f000 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/TieMethod.jav +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/TieMethod.jav diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/TieMethodVoid.jav b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/TieMethodVoid.jav index 3db17da..3db17da 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/templates/TieMethodVoid.jav +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/rmic/templates/TieMethodVoid.jav diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/rmid/messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/rmid/messages.properties new file mode 100644 index 0000000..234cea1 --- /dev/null +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/rmid/messages.properties @@ -0,0 +1,50 @@ +# messages.properties -- English language messages +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +Main.Usage=Usage: rmid [OPTIONS] +Main.ControlGroup=Activation process control +Main.PortOption=port on which activation system is to be started +Main.Port=PORT +Main.Restart=restart activation system, clearing persistent naming database, if any +Main.Stop=stop activation system +Main.PersistenceGroup=Persistence +Main.Persistent=make activation system persistent +Main.Directory=directory in which to store persistent data +Main.DirectoryArgument=DIRECTORY +Main.DebugGroup=Debugging +Main.Verbose=log binding events to standard out +Main.InternalError=rmid: internal error: diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/rmiregistry/messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/rmiregistry/messages.properties new file mode 100644 index 0000000..46f7cfd --- /dev/null +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/rmiregistry/messages.properties @@ -0,0 +1,48 @@ +# messages.properties -- English language messages +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +Main.Usage=Usage: rmiregistry [OPTIONS] [PORT] +Main.ControlGroup=Registry process control +Main.Restart=restart RMI naming service, clearing persistent naming database, if any +Main.Stop=stop RMI naming service +Main.PersistenceGroup=Persistence +Main.Persistent=make RMI naming service persistent +Main.Directory=directory in which to store persistent data +Main.DirectoryArgument=DIRECTORY +Main.DebugGroup=Debugging +Main.Verbose=log binding events to standard out +Main.InternalError=rmiregistry: internal error: diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/serialver/messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/serialver/messages.properties new file mode 100644 index 0000000..8900795 --- /dev/null +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/serialver/messages.properties @@ -0,0 +1,44 @@ +# messages.properties -- English language messages +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +SerialVer.NoClassesSpecd=no classes specified +SerialVer.HelpHeader=serialver [OPTIONS]... CLASS...\n\nPrint the serialVersionUID of the specified classes +SerialVer.5=classpath +SerialVer.ClasspathHelp=class path to use to find classes +SerialVer.ClassNotSerial=serialver: class {0} is not serializable +SerialVer.ClassNotFound=serialver: class {0} not found +SerialVer.DupClasspath=classpath already specified diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/tnameserv/messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/tnameserv/messages.properties new file mode 100644 index 0000000..3861e24 --- /dev/null +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/tnameserv/messages.properties @@ -0,0 +1,43 @@ +# messages.properties -- English language messages +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +Main.Usage=Usage: tnameserv [OPTIONS] +Main.ORBInitialPort=port on which naming service is to be started +Main.Port=PORT +Main.IOR=file in which to store naming service's IOR reference +Main.IORFile=FILE +Main.InternalError=tnameserv: internal error: diff --git a/libjava/classpath/tools/resource/sun/rmi/rmic/messages.properties b/libjava/classpath/tools/resource/sun/rmi/rmic/messages.properties new file mode 100644 index 0000000..4c897fd --- /dev/null +++ b/libjava/classpath/tools/resource/sun/rmi/rmic/messages.properties @@ -0,0 +1,38 @@ +# messages.properties -- English language messages +# Copyright (C) 2007 Free Software Foundation, Inc. +# +# This file is part of GNU Classpath. +# +# GNU Classpath is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Classpath is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Classpath; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give you +# permission to link this library with independent modules to produce an +# executable, regardless of the license terms of these independent +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# this exception to your version of the library, but you are not +# obligated to do so. If you do not wish to do so, delete this +# exception statement from your version. + +Main.InternalError:sun.rmi.rmic: failed to run rmic main method |