--- a/make/com/sun/org/apache/xml/Makefile	Tue Jan 13 09:21:54 2009 -0800
+++ b/make/com/sun/org/apache/xml/Makefile	Tue Jan 20 13:02:58 2009 -0800
@@ -41,7 +41,7 @@ AUTO_FILES_JAVA_DIRS = com/sun/org/apach
 # Resources
 #
 LOCALE_SET_DEFINITION = jre
-NEW_RESOURCE_BUNDLES_PROPERTIES = \
+NEW_RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = \
    $(PKGDIR)/internal/security/resource/config.dtd \
    $(PKGDIR)/internal/security/resource/config.xml \
    $(PKGDIR)/internal/security/resource/xmlsecurity_de.properties \

--- a/make/com/sun/rowset/Makefile	Tue Jan 13 09:21:54 2009 -0800
+++ b/make/com/sun/rowset/Makefile	Tue Jan 20 13:02:58 2009 -0800
@@ -41,7 +41,7 @@ AUTO_FILES_JAVA_DIRS = com/sun/rowset
 # Resources
 #
 LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_PROPERTIES = $(PKGDIR)/RowSetResourceBundle.properties
+RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/RowSetResourceBundle.properties
 
 #
 # Rules

--- a/make/common/internal/Resources.gmk	Tue Jan 13 09:21:54 2009 -0800
+++ b/make/common/internal/Resources.gmk	Tue Jan 20 13:02:58 2009 -0800
@@ -44,12 +44,8 @@
 #
 #   NEW_RESOURCE_BUNDLES_JAVA        - new resource bundles implemented in
 #                                      Java, not localized
-#   NEW_RESOURCE_BUNDLES_PROPERTIES  - new resource bundles implemented as
-#                                      properties files, not localized
 #   RESOURCE_BUNDLES_JAVA            - resource bundles implemented in
 #                                      Java, localized
-#   RESOURCE_BUNDLES_PROPERTIES      - new resource bundles implemented as
-#                                      properties files, localized
 #
 # The following variable is now used for most .properties files in the JDK. 
 # These properties files are converted into java and compiled with javac.
@@ -60,6 +56,13 @@
 #   RESOURCE_BUNDLES_COMPILED_PROPERTIES - resource bundles implemented as
 #                                          properties files, localized
 #   NEW_RESOURCE_BUNDLES_COMPILED_PROPERTIES - same as above, not localized
+#
+# For non-compiled properties files, use the following variables:
+#
+#   NEW_RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES  - new resource bundles implemented as
+#                                      properties files, not localized
+#   RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES      - resource bundles implemented as
+#                                      properties files, localized
 #
 # Other properties files to be installed are identified using the variable:
 #
@@ -109,11 +112,12 @@ FILES_java += $(COMPILED_PROPERTIES:%.pr
 FILES_java += $(COMPILED_PROPERTIES:%.properties=%.java)
 
 # Non-compiled files
-PROPERTIES_FILES += $(NEW_RESOURCE_BUNDLES_PROPERTIES)
-PROPERTIES_FILES += $(RESOURCE_BUNDLES_PROPERTIES) \
-    $(foreach file,$(RESOURCE_BUNDLES_PROPERTIES), \
+PROPERTIES_FILES += $(NEW_RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES)
+PROPERTIES_FILES += $(RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES) \
+    $(foreach file,$(RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES), \
        $(foreach locale,$(LOCALE_SUFFIXES), \
 	  $(basename $(file))_$(locale)$(suffix $(file))))
+# other properties
 PROPERTIES_FILES += $(OTHER_PROPERTIES)
 
 #

--- a/make/sun/launcher/Makefile	Tue Jan 13 09:21:54 2009 -0800
+++ b/make/sun/launcher/Makefile	Tue Jan 20 13:02:58 2009 -0800
@@ -37,7 +37,7 @@ AUTO_FILES_JAVA_DIRS = sun/launcher
 # Resources
 #
 LOCALE_SET_DEFINITION = jre
-NEW_RESOURCE_BUNDLES_PROPERTIES = $(PKGDIR)/resources/launcher.properties
+NEW_RESOURCE_BUNDLES_COMPILED_PROPERTIES = $(PKGDIR)/resources/launcher.properties
 
 #
 # Rules

--- a/make/sun/rmi/oldtools/Makefile	Tue Jan 13 09:21:54 2009 -0800
+++ b/make/sun/rmi/oldtools/Makefile	Tue Jan 20 13:02:58 2009 -0800
@@ -41,7 +41,7 @@ include FILES_java.gmk
 # Resources
 #
 LOCALE_SET_DEFINITION = j2sdk
-RESOURCE_BUNDLES_PROPERTIES = sun/tools/javac/resources/javac.properties
+RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = sun/tools/javac/resources/javac.properties
 
 #
 # Rules

--- a/make/sun/rmi/registry/Makefile	Tue Jan 13 09:21:54 2009 -0800
+++ b/make/sun/rmi/registry/Makefile	Tue Jan 20 13:02:58 2009 -0800
@@ -41,7 +41,7 @@ AUTO_FILES_JAVA_DIRS = sun/rmi/registry
 # Resources
 #
 LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_PROPERTIES = $(PKGDIR)/resources/rmiregistry.properties
+RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/resources/rmiregistry.properties
 
 #
 # Rules

--- a/make/sun/rmi/rmic/Makefile	Tue Jan 13 09:21:54 2009 -0800
+++ b/make/sun/rmi/rmic/Makefile	Tue Jan 20 13:02:58 2009 -0800
@@ -43,7 +43,7 @@ FILES_java = $(RMIC_java)
 # Resources
 #
 LOCALE_SET_DEFINITION = jdk
-RESOURCE_BUNDLES_PROPERTIES = $(PKGDIR)/resources/rmic.properties
+RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/resources/rmic.properties
 
 #
 # Rules

--- a/make/sun/rmi/rmid/Makefile	Tue Jan 13 09:21:54 2009 -0800
+++ b/make/sun/rmi/rmid/Makefile	Tue Jan 20 13:02:58 2009 -0800
@@ -39,7 +39,7 @@ build: stubs
 # Resources
 #
 LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_PROPERTIES = sun/rmi/server/resources/rmid.properties
+RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = sun/rmi/server/resources/rmid.properties
 
 #
 # Extra dependencies.

--- a/make/sun/serialver/Makefile	Tue Jan 13 09:21:54 2009 -0800
+++ b/make/sun/serialver/Makefile	Tue Jan 20 13:02:58 2009 -0800
@@ -41,7 +41,7 @@ AUTO_FILES_JAVA_DIRS = sun/tools/serialv
 # Resources
 #
 LOCALE_SET_DEFINITION = jdk
-RESOURCE_BUNDLES_PROPERTIES = $(PKGDIR)/resources/serialver.properties 
+RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/resources/serialver.properties 
 
 #
 # Rules