2008-02-21 Andrew John Hughes <gnu_andrew@member.fsf.org>

        PR classpath/35111:
	* resource/com/sun/tools/javac/messages.properties,
	* resource/gnu/classpath/tools/appletviewer/messages.properties,
	* resource/gnu/classpath/tools/common/Messages.properties,
	* resource/gnu/classpath/tools/getopt/Messages.properties,
	* resource/gnu/classpath/tools/jar/messages.properties,
	* resource/gnu/classpath/tools/jarsigner/messages.properties,
	* resource/gnu/classpath/tools/keytool/messages.properties,
	* resource/gnu/classpath/tools/native2ascii/messages.properties,
	* resource/gnu/classpath/tools/orbd/messages.properties,
	* resource/gnu/classpath/tools/rmic/messages.properties,
	* resource/gnu/classpath/tools/rmid/messages.properties,
	* resource/gnu/classpath/tools/rmiregistry/messages.properties,
	* resource/gnu/classpath/tools/serialver/messages.properties,
	* resource/gnu/classpath/tools/tnameserv/messages.properties,
	* resource/sun/rmi/rmic/messages.properties:
	Removed.
	* tools/Makefile.am:
	Copy .jav template files and use resource subdirectory
	of tools.
	* tools/gnu/classpath/tools/rmic/templates/ImplTie.jav,
	* tools/gnu/classpath/tools/rmic/templates/Stub.jav,
	* tools/gnu/classpath/tools/rmic/templates/StubMethod.jav,
	* tools/gnu/classpath/tools/rmic/templates/StubMethodVoid.jav,
	* tools/gnu/classpath/tools/rmic/templates/Stub_12.jav,
	* tools/gnu/classpath/tools/rmic/templates/Stub_12Method.jav,
	* tools/gnu/classpath/tools/rmic/templates/Stub_12MethodVoid.jav,
	* tools/gnu/classpath/tools/rmic/templates/Tie.jav,
	* tools/gnu/classpath/tools/rmic/templates/TieMethod.jav,
	* tools/gnu/classpath/tools/rmic/templates/TieMethodVoid.jav:
	Removed.
	* tools/resource/com/sun/tools/javac/messages.properties,
	* tools/resource/gnu/classpath/tools/appletviewer/messages.properties,
	* tools/resource/gnu/classpath/tools/common/Messages.properties,
	* tools/resource/gnu/classpath/tools/getopt/Messages.properties,
	* tools/resource/gnu/classpath/tools/jar/messages.properties,
	* tools/resource/gnu/classpath/tools/jarsigner/messages.properties,
	* tools/resource/gnu/classpath/tools/keytool/messages.properties,
	* tools/resource/gnu/classpath/tools/native2ascii/messages.properties,
	* tools/resource/gnu/classpath/tools/orbd/messages.properties,
	* tools/resource/gnu/classpath/tools/rmic/messages.properties,
	* tools/resource/gnu/classpath/tools/rmic/templates/ImplTie.jav,
	* tools/resource/gnu/classpath/tools/rmic/templates/Stub.jav,
	* tools/resource/gnu/classpath/tools/rmic/templates/StubMethod.jav,
	* tools/resource/gnu/classpath/tools/rmic/templates/StubMethodVoid.jav,
	* tools/resource/gnu/classpath/tools/rmic/templates/Stub_12.jav,
	* tools/resource/gnu/classpath/tools/rmic/templates/Stub_12Method.jav,
	* tools/resource/gnu/classpath/tools/rmic/templates/Stub_12MethodVoid.jav,
	* tools/resource/gnu/classpath/tools/rmic/templates/Tie.jav,
	* tools/resource/gnu/classpath/tools/rmic/templates/TieMethod.jav,
	* tools/resource/gnu/classpath/tools/rmic/templates/TieMethodVoid.jav,
	* tools/resource/gnu/classpath/tools/rmid/messages.properties,
	* tools/resource/gnu/classpath/tools/rmiregistry/messages.properties,
	* tools/resource/gnu/classpath/tools/serialver/messages.properties,
	* tools/resource/gnu/classpath/tools/tnameserv/messages.properties,
	* tools/resource/sun/rmi/rmic/messages.properties:
	Added.

27 files changed, 65 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index a7806ef27..66c11c9c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+2008-02-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+        PR classpath/35111:
+	* resource/com/sun/tools/javac/messages.properties,
+	* resource/gnu/classpath/tools/appletviewer/messages.properties,
+	* resource/gnu/classpath/tools/common/Messages.properties,
+	* resource/gnu/classpath/tools/getopt/Messages.properties,
+	* resource/gnu/classpath/tools/jar/messages.properties,
+	* resource/gnu/classpath/tools/jarsigner/messages.properties,
+	* resource/gnu/classpath/tools/keytool/messages.properties,
+	* resource/gnu/classpath/tools/native2ascii/messages.properties,
+	* resource/gnu/classpath/tools/orbd/messages.properties,
+	* resource/gnu/classpath/tools/rmic/messages.properties,
+	* resource/gnu/classpath/tools/rmid/messages.properties,
+	* resource/gnu/classpath/tools/rmiregistry/messages.properties,
+	* resource/gnu/classpath/tools/serialver/messages.properties,
+	* resource/gnu/classpath/tools/tnameserv/messages.properties,
+	* resource/sun/rmi/rmic/messages.properties:
+	Removed.
+	* tools/Makefile.am:
+	Copy .jav template files and use resource subdirectory
+	of tools.
+	* tools/gnu/classpath/tools/rmic/templates/ImplTie.jav,
+	* tools/gnu/classpath/tools/rmic/templates/Stub.jav,
+	* tools/gnu/classpath/tools/rmic/templates/StubMethod.jav,
+	* tools/gnu/classpath/tools/rmic/templates/StubMethodVoid.jav,
+	* tools/gnu/classpath/tools/rmic/templates/Stub_12.jav,
+	* tools/gnu/classpath/tools/rmic/templates/Stub_12Method.jav,
+	* tools/gnu/classpath/tools/rmic/templates/Stub_12MethodVoid.jav,
+	* tools/gnu/classpath/tools/rmic/templates/Tie.jav,
+	* tools/gnu/classpath/tools/rmic/templates/TieMethod.jav,
+	* tools/gnu/classpath/tools/rmic/templates/TieMethodVoid.jav:
+	Removed.
+	* tools/resource/com/sun/tools/javac/messages.properties,
+	* tools/resource/gnu/classpath/tools/appletviewer/messages.properties,
+	* tools/resource/gnu/classpath/tools/common/Messages.properties,
+	* tools/resource/gnu/classpath/tools/getopt/Messages.properties,
+	* tools/resource/gnu/classpath/tools/jar/messages.properties,
+	* tools/resource/gnu/classpath/tools/jarsigner/messages.properties,
+	* tools/resource/gnu/classpath/tools/keytool/messages.properties,
+	* tools/resource/gnu/classpath/tools/native2ascii/messages.properties,
+	* tools/resource/gnu/classpath/tools/orbd/messages.properties,
+	* tools/resource/gnu/classpath/tools/rmic/messages.properties,
+	* tools/resource/gnu/classpath/tools/rmic/templates/ImplTie.jav,
+	* tools/resource/gnu/classpath/tools/rmic/templates/Stub.jav,
+	* tools/resource/gnu/classpath/tools/rmic/templates/StubMethod.jav,
+	* tools/resource/gnu/classpath/tools/rmic/templates/StubMethodVoid.jav,
+	* tools/resource/gnu/classpath/tools/rmic/templates/Stub_12.jav,
+	* tools/resource/gnu/classpath/tools/rmic/templates/Stub_12Method.jav,
+	* tools/resource/gnu/classpath/tools/rmic/templates/Stub_12MethodVoid.jav,
+	* tools/resource/gnu/classpath/tools/rmic/templates/Tie.jav,
+	* tools/resource/gnu/classpath/tools/rmic/templates/TieMethod.jav,
+	* tools/resource/gnu/classpath/tools/rmic/templates/TieMethodVoid.jav,
+	* tools/resource/gnu/classpath/tools/rmid/messages.properties,
+	* tools/resource/gnu/classpath/tools/rmiregistry/messages.properties,
+	* tools/resource/gnu/classpath/tools/serialver/messages.properties,
+	* tools/resource/gnu/classpath/tools/tnameserv/messages.properties,
+	* tools/resource/sun/rmi/rmic/messages.properties:
+	Added.
+	
 2008-02-18  Roman Kennke  <kennke@aicas.com>
 
 	* gnu/java/awt/peer/x/XGraphics2D.java
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d6724ef60..6dd92abd3 100755
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -115,7 +115,7 @@ TOOLS_ZIP = tools.zip
 BUILT_SOURCES = $(TOOLS_ZIP)
 
 # RMIC templates that must be included in the generated zip file.
-RMIC_TEMPLATES = $(srcdir)/gnu/classpath/tools/rmic/templates/*.jav
+RMIC_TEMPLATES = $(srcdir)/resource/gnu/classpath/tools/rmic/templates/*.jav
 
 # All the files we find "interesting"
 ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(RMIC_TEMPLATES)
@@ -161,14 +161,13 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
 	$(JCOMPILER) -g -d classes @classes.lst
 	cat classes.lst asm.lst > all-classes.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
 ## First add classpath tools stuff.
 	(cd classes; \
diff --git a/resource/com/sun/tools/javac/messages.properties b/tools/resource/com/sun/tools/javac/messages.properties
index 995e871d9..995e871d9 100644
--- a/resource/com/sun/tools/javac/messages.properties
+++ b/tools/resource/com/sun/tools/javac/messages.properties
diff --git a/resource/gnu/classpath/tools/appletviewer/messages.properties b/tools/resource/gnu/classpath/tools/appletviewer/messages.properties
index c826afa21..c826afa21 100644
--- a/resource/gnu/classpath/tools/appletviewer/messages.properties
+++ b/tools/resource/gnu/classpath/tools/appletviewer/messages.properties
diff --git a/resource/gnu/classpath/tools/common/Messages.properties b/tools/resource/gnu/classpath/tools/common/Messages.properties
index 989fde74e..989fde74e 100644
--- a/resource/gnu/classpath/tools/common/Messages.properties
+++ b/tools/resource/gnu/classpath/tools/common/Messages.properties
diff --git a/resource/gnu/classpath/tools/getopt/Messages.properties b/tools/resource/gnu/classpath/tools/getopt/Messages.properties
index a747ab4b4..a747ab4b4 100644
--- a/resource/gnu/classpath/tools/getopt/Messages.properties
+++ b/tools/resource/gnu/classpath/tools/getopt/Messages.properties
diff --git a/resource/gnu/classpath/tools/jar/messages.properties b/tools/resource/gnu/classpath/tools/jar/messages.properties
index a456fe243..a456fe243 100644
--- a/resource/gnu/classpath/tools/jar/messages.properties
+++ b/tools/resource/gnu/classpath/tools/jar/messages.properties
diff --git a/resource/gnu/classpath/tools/jarsigner/messages.properties b/tools/resource/gnu/classpath/tools/jarsigner/messages.properties
index d4088177c..d4088177c 100644
--- a/resource/gnu/classpath/tools/jarsigner/messages.properties
+++ b/tools/resource/gnu/classpath/tools/jarsigner/messages.properties
diff --git a/resource/gnu/classpath/tools/keytool/messages.properties b/tools/resource/gnu/classpath/tools/keytool/messages.properties
index 98f4e6842..98f4e6842 100644
--- a/resource/gnu/classpath/tools/keytool/messages.properties
+++ b/tools/resource/gnu/classpath/tools/keytool/messages.properties
diff --git a/resource/gnu/classpath/tools/native2ascii/messages.properties b/tools/resource/gnu/classpath/tools/native2ascii/messages.properties
index f04d184f2..f04d184f2 100644
--- a/resource/gnu/classpath/tools/native2ascii/messages.properties
+++ b/tools/resource/gnu/classpath/tools/native2ascii/messages.properties
diff --git a/resource/gnu/classpath/tools/orbd/messages.properties b/tools/resource/gnu/classpath/tools/orbd/messages.properties
index b427d102b..b427d102b 100644
--- a/resource/gnu/classpath/tools/orbd/messages.properties
+++ b/tools/resource/gnu/classpath/tools/orbd/messages.properties
diff --git a/resource/gnu/classpath/tools/rmic/messages.properties b/tools/resource/gnu/classpath/tools/rmic/messages.properties
index 7be7cb0c7..7be7cb0c7 100644
--- a/resource/gnu/classpath/tools/rmic/messages.properties
+++ b/tools/resource/gnu/classpath/tools/rmic/messages.properties
diff --git a/tools/gnu/classpath/tools/rmic/templates/ImplTie.jav b/tools/resource/gnu/classpath/tools/rmic/templates/ImplTie.jav
index aff606b90..aff606b90 100644
--- a/tools/gnu/classpath/tools/rmic/templates/ImplTie.jav
+++ b/tools/resource/gnu/classpath/tools/rmic/templates/ImplTie.jav
diff --git a/tools/gnu/classpath/tools/rmic/templates/Stub.jav b/tools/resource/gnu/classpath/tools/rmic/templates/Stub.jav
index 371e12d44..371e12d44 100644
--- a/tools/gnu/classpath/tools/rmic/templates/Stub.jav
+++ b/tools/resource/gnu/classpath/tools/rmic/templates/Stub.jav
diff --git a/tools/gnu/classpath/tools/rmic/templates/StubMethod.jav b/tools/resource/gnu/classpath/tools/rmic/templates/StubMethod.jav
index 17636deb6..17636deb6 100644
--- a/tools/gnu/classpath/tools/rmic/templates/StubMethod.jav
+++ b/tools/resource/gnu/classpath/tools/rmic/templates/StubMethod.jav
diff --git a/tools/gnu/classpath/tools/rmic/templates/StubMethodVoid.jav b/tools/resource/gnu/classpath/tools/rmic/templates/StubMethodVoid.jav
index 0125a02b0..0125a02b0 100644
--- a/tools/gnu/classpath/tools/rmic/templates/StubMethodVoid.jav
+++ b/tools/resource/gnu/classpath/tools/rmic/templates/StubMethodVoid.jav
diff --git a/tools/gnu/classpath/tools/rmic/templates/Stub_12.jav b/tools/resource/gnu/classpath/tools/rmic/templates/Stub_12.jav
index 1c55a0597..1c55a0597 100644
--- a/tools/gnu/classpath/tools/rmic/templates/Stub_12.jav
+++ b/tools/resource/gnu/classpath/tools/rmic/templates/Stub_12.jav
diff --git a/tools/gnu/classpath/tools/rmic/templates/Stub_12Method.jav b/tools/resource/gnu/classpath/tools/rmic/templates/Stub_12Method.jav
index 9aaf8f5ad..9aaf8f5ad 100644
--- a/tools/gnu/classpath/tools/rmic/templates/Stub_12Method.jav
+++ b/tools/resource/gnu/classpath/tools/rmic/templates/Stub_12Method.jav
diff --git a/tools/gnu/classpath/tools/rmic/templates/Stub_12MethodVoid.jav b/tools/resource/gnu/classpath/tools/rmic/templates/Stub_12MethodVoid.jav
index 860a93c84..860a93c84 100644
--- a/tools/gnu/classpath/tools/rmic/templates/Stub_12MethodVoid.jav
+++ b/tools/resource/gnu/classpath/tools/rmic/templates/Stub_12MethodVoid.jav
diff --git a/tools/gnu/classpath/tools/rmic/templates/Tie.jav b/tools/resource/gnu/classpath/tools/rmic/templates/Tie.jav
index 797ae1401..797ae1401 100644
--- a/tools/gnu/classpath/tools/rmic/templates/Tie.jav
+++ b/tools/resource/gnu/classpath/tools/rmic/templates/Tie.jav
diff --git a/tools/gnu/classpath/tools/rmic/templates/TieMethod.jav b/tools/resource/gnu/classpath/tools/rmic/templates/TieMethod.jav
index 493f0009b..493f0009b 100644
--- a/tools/gnu/classpath/tools/rmic/templates/TieMethod.jav
+++ b/tools/resource/gnu/classpath/tools/rmic/templates/TieMethod.jav
diff --git a/tools/gnu/classpath/tools/rmic/templates/TieMethodVoid.jav b/tools/resource/gnu/classpath/tools/rmic/templates/TieMethodVoid.jav
index 3db17da7c..3db17da7c 100644
--- a/tools/gnu/classpath/tools/rmic/templates/TieMethodVoid.jav
+++ b/tools/resource/gnu/classpath/tools/rmic/templates/TieMethodVoid.jav
diff --git a/resource/gnu/classpath/tools/rmid/messages.properties b/tools/resource/gnu/classpath/tools/rmid/messages.properties
index 234cea12a..234cea12a 100644
--- a/resource/gnu/classpath/tools/rmid/messages.properties
+++ b/tools/resource/gnu/classpath/tools/rmid/messages.properties
diff --git a/resource/gnu/classpath/tools/rmiregistry/messages.properties b/tools/resource/gnu/classpath/tools/rmiregistry/messages.properties
index 46f7cfdb7..46f7cfdb7 100644
--- a/resource/gnu/classpath/tools/rmiregistry/messages.properties
+++ b/tools/resource/gnu/classpath/tools/rmiregistry/messages.properties
diff --git a/resource/gnu/classpath/tools/serialver/messages.properties b/tools/resource/gnu/classpath/tools/serialver/messages.properties
index 8900795d4..8900795d4 100644
--- a/resource/gnu/classpath/tools/serialver/messages.properties
+++ b/tools/resource/gnu/classpath/tools/serialver/messages.properties
diff --git a/resource/gnu/classpath/tools/tnameserv/messages.properties b/tools/resource/gnu/classpath/tools/tnameserv/messages.properties
index 3861e24ba..3861e24ba 100644
--- a/resource/gnu/classpath/tools/tnameserv/messages.properties
+++ b/tools/resource/gnu/classpath/tools/tnameserv/messages.properties
diff --git a/resource/sun/rmi/rmic/messages.properties b/tools/resource/sun/rmi/rmic/messages.properties
index 4c897fd5e..4c897fd5e 100644
--- a/resource/sun/rmi/rmic/messages.properties
+++ b/tools/resource/sun/rmi/rmic/messages.properties