--- a/jdk/make/com/sun/org/apache/xml/Makefile Mon Jan 19 18:49:10 2009 +0800
+++ b/jdk/make/com/sun/org/apache/xml/Makefile Tue Jan 20 16:16:35 2009 -0800
@@ -41,7 +41,7 @@
# 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/jdk/make/com/sun/rowset/Makefile Mon Jan 19 18:49:10 2009 +0800
+++ b/jdk/make/com/sun/rowset/Makefile Tue Jan 20 16:16:35 2009 -0800
@@ -41,7 +41,7 @@
# Resources
#
LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_PROPERTIES = $(PKGDIR)/RowSetResourceBundle.properties
+RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/RowSetResourceBundle.properties
#
# Rules
--- a/jdk/make/common/internal/Resources.gmk Mon Jan 19 18:49:10 2009 +0800
+++ b/jdk/make/common/internal/Resources.gmk Tue Jan 20 16:16:35 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.
@@ -61,6 +57,13 @@
# 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:
#
# OTHER_PROPERTIES
@@ -109,11 +112,12 @@
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/jdk/make/sun/launcher/Makefile Mon Jan 19 18:49:10 2009 +0800
+++ b/jdk/make/sun/launcher/Makefile Tue Jan 20 16:16:35 2009 -0800
@@ -37,7 +37,7 @@
# Resources
#
LOCALE_SET_DEFINITION = jre
-NEW_RESOURCE_BUNDLES_PROPERTIES = $(PKGDIR)/resources/launcher.properties
+NEW_RESOURCE_BUNDLES_COMPILED_PROPERTIES = $(PKGDIR)/resources/launcher.properties
#
# Rules
--- a/jdk/make/sun/rmi/oldtools/Makefile Mon Jan 19 18:49:10 2009 +0800
+++ b/jdk/make/sun/rmi/oldtools/Makefile Tue Jan 20 16:16:35 2009 -0800
@@ -41,7 +41,7 @@
# 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/jdk/make/sun/rmi/registry/Makefile Mon Jan 19 18:49:10 2009 +0800
+++ b/jdk/make/sun/rmi/registry/Makefile Tue Jan 20 16:16:35 2009 -0800
@@ -41,7 +41,7 @@
# Resources
#
LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_PROPERTIES = $(PKGDIR)/resources/rmiregistry.properties
+RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/resources/rmiregistry.properties
#
# Rules
--- a/jdk/make/sun/rmi/rmic/Makefile Mon Jan 19 18:49:10 2009 +0800
+++ b/jdk/make/sun/rmi/rmic/Makefile Tue Jan 20 16:16:35 2009 -0800
@@ -43,7 +43,7 @@
# Resources
#
LOCALE_SET_DEFINITION = jdk
-RESOURCE_BUNDLES_PROPERTIES = $(PKGDIR)/resources/rmic.properties
+RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/resources/rmic.properties
#
# Rules
--- a/jdk/make/sun/rmi/rmid/Makefile Mon Jan 19 18:49:10 2009 +0800
+++ b/jdk/make/sun/rmi/rmid/Makefile Tue Jan 20 16:16:35 2009 -0800
@@ -39,7 +39,7 @@
# 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/jdk/make/sun/serialver/Makefile Mon Jan 19 18:49:10 2009 +0800
+++ b/jdk/make/sun/serialver/Makefile Tue Jan 20 16:16:35 2009 -0800
@@ -41,7 +41,7 @@
# Resources
#
LOCALE_SET_DEFINITION = jdk
-RESOURCE_BUNDLES_PROPERTIES = $(PKGDIR)/resources/serialver.properties
+RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/resources/serialver.properties
#
# Rules
--- a/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java Mon Jan 19 18:49:10 2009 +0800
+++ b/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java Tue Jan 20 16:16:35 2009 -0800
@@ -60,9 +60,6 @@
// Memory allocation size for mapping buffers
private static final long allocationGranularity;
- // Cached field for MappedByteBuffer.isAMappedBuffer
- private static final Field isAMappedBufferField;
-
// File descriptor
private final FileDescriptor fd;
@@ -1315,8 +1312,6 @@
Util.load();
allocationGranularity = initIDs();
nd = new FileDispatcher();
- isAMappedBufferField = Reflect.lookupField("java.nio.MappedByteBuffer",
- "isAMappedBuffer");
}
}