2006-09-22 Thomas Fitzsimmons <fitzsim@redhat.com>

	* resource/gnu/classpath/tools/orbd: New directory.
	* resource/gnu/classpath/tools/rmic: Likewise.
	* resource/gnu/classpath/tools/rmid: Likewise.
	* resource/gnu/classpath/tools/rmiregistry: Likewise.
	* resource/gnu/classpath/tools/tnameserv: Likewise.
	* tools/gnu/classpath/tools/giop: Move contents to...
	* tools/gnu/classpath/tools/orbd,
	tools/gnu/classpath/tools/tnameserv: New directories.
	* tools/gnu/classpath/tools/rmi/rmic: Move contents to...
	* tools/gnu/classpath/tools/rmic: New directory.
	* tools/gnu/classpath/tools/rmi/rmid: Move contents to...
	* tools/gnu/classpath/tools/rmid: New directory.
	* tools/gnu/classpath/tools/rmi/registry: Move contents to...
	* tools/gnu/classpath/tools/rmiregistry: New directory.
	* resource/gnu/classpath/tools/orbd/messages.properties: New file.
	* resource/gnu/classpath/tools/rmic/messages.properties: Likewise.
	* resource/gnu/classpath/tools/rmid/messages.properties: Likewise.
	* resource/gnu/classpath/tools/rmiregistry/messages.properties:
	Likewise.
	* resource/gnu/classpath/tools/tnameserv/messages.properties:
	Likewise.
	* tools/gnu/classpath/tools/orbd/Main.java,
	tools/gnu/classpath/tools/orbd/Messages.java,
	tools/gnu/classpath/tools/orbd/PersistentContext.java,
	tools/gnu/classpath/tools/orbd/PersistentContextMap.java,
	tools/gnu/classpath/tools/orbd/PersistentMap.java,
	tools/gnu/classpath/tools/rmic/AbstractMethodGenerator.java,
	tools/gnu/classpath/tools/rmic/CompilationError.java,
	tools/gnu/classpath/tools/rmic/Generator.java,
	tools/gnu/classpath/tools/rmic/GiopIo.java,
	tools/gnu/classpath/tools/rmic/HashFinder.java,
	tools/gnu/classpath/tools/rmic/Main.java,
	tools/gnu/classpath/tools/rmic/Messages.java,
	tools/gnu/classpath/tools/rmic/MethodGenerator.java,
	tools/gnu/classpath/tools/rmic/RMICException.java,
	tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java,
	tools/gnu/classpath/tools/rmic/RmicBackend.java,
	tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java,
	tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java,
	tools/gnu/classpath/tools/rmic/Variables.java,
	tools/gnu/classpath/tools/rmic/WrapUnWrapper.java,
	tools/gnu/classpath/tools/rmic/templates,
	tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java,
	tools/gnu/classpath/tools/rmid/ActivationSystemImpl_Stub.java,
	tools/gnu/classpath/tools/rmid/Main.java,
	tools/gnu/classpath/tools/rmid/Messages.java,
	tools/gnu/classpath/tools/rmid/PersistentBidiHashTable.java,
	tools/gnu/classpath/tools/rmiregistry/Main.java,
	tools/gnu/classpath/tools/rmiregistry/Messages.java,
	tools/gnu/classpath/tools/rmiregistry/PersistentHashTable.java,
	tools/gnu/classpath/tools/rmiregistry/RegistryImpl.java,
	tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Skel.java,
	tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Stub.java,
	tools/gnu/classpath/tools/tnameserv/Main.java,
	tools/gnu/classpath/tools/tnameserv/Messages.java: New files.
	* tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java: Import
	RMIC.java from cp-tools.
	* configure.ac (AC_CONFIG_FILES): Add tools/grmiregistry,
	tools/gtnameserv, tools/gorbd, tools/grmid and tools/grmic.
	(AC_CONFIG_COMMANDS): Add grmiregistry, gtnameserv, gorbd, grmid
	and grmic.
	* examples/Makefile.am (GLIBJ_CLASSPATH): Add tools.zip.
	* gnu/CORBA/NamingService/NamingServiceTransient.java (main):
	Rename...
	(start): New method.
	* tools/Makefile.am: Add build support for new tool wrappers.
	* tools/gorbd.in: New file.
	* tools/grmic.in: Likewise.
	* tools/grmid.in: Likewise.
	* tools/grmiregistry.in: Likewise.
	* tools/gtnameserv.in: Likewise.
	* tools/gnu/classpath/tools/AbstractMethodGenerator.java: Move to...
	* tools/gnu/classpath/tools/rmic/AbstractMethodGenerator.java: New
	file.
	* tools/gnu/classpath/tools/HelpPrinter.java: Remove file.
	* tools/gnu/classpath/tools/rmi/Persistent.java: Move to...
	* tools/gnu/classpath/tools/common/Persistent.java: New file.

5 files changed, 248 insertions, 0 deletions

diff --git a/resource/gnu/classpath/tools/orbd/messages.properties b/resource/gnu/classpath/tools/orbd/messages.properties
new file mode 100644
index 000000000..b427d102b
--- /dev/null
+++ b/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/resource/gnu/classpath/tools/rmic/messages.properties b/resource/gnu/classpath/tools/rmic/messages.properties
new file mode 100644
index 000000000..7be7cb0c7
--- /dev/null
+++ b/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/resource/gnu/classpath/tools/rmid/messages.properties b/resource/gnu/classpath/tools/rmid/messages.properties
new file mode 100644
index 000000000..234cea12a
--- /dev/null
+++ b/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/resource/gnu/classpath/tools/rmiregistry/messages.properties b/resource/gnu/classpath/tools/rmiregistry/messages.properties
new file mode 100644
index 000000000..46f7cfdb7
--- /dev/null
+++ b/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/resource/gnu/classpath/tools/tnameserv/messages.properties b/resource/gnu/classpath/tools/tnameserv/messages.properties
new file mode 100644
index 000000000..3861e24ba
--- /dev/null
+++ b/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: