changeset 10826:d69a6c5e3ee4

Move net.properties to conf
author chegar
date Wed, 15 Oct 2014 15:39:32 +0100
parents 92780fb9baa1
children 3995fd63f47b
files make/copy/Copy-java.base.gmk make/src/classes/build/tools/module/ModuleArchive.java src/java.base/share/classes/sun/net/NetProperties.java
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/copy/Copy-java.base.gmk	Wed Oct 15 13:56:18 2014 +0200
+++ b/make/copy/Copy-java.base.gmk	Wed Oct 15 15:39:32 2014 +0100
@@ -204,11 +204,11 @@
 
 ################################################################################
 
-$(LIB_DST_DIR)/net.properties: $(JDK_TOPDIR)/src/java.base/share/conf/net.properties
+$(CONF_DST_DIR)/net.properties: $(JDK_TOPDIR)/src/java.base/share/conf/net.properties
 	$(ECHO) $(LOG_INFO) Copying $(@F)
 	$(call install-file)
 
-TARGETS += $(LIB_DST_DIR)/net.properties
+TARGETS += $(CONF_DST_DIR)/net.properties
 
 ifeq ($(OPENJDK_TARGET_OS), solaris)
   $(LIB_DST_DIR)/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/java.base/${OPENJDK_TARGET_OS_API_DIR}/conf/sdp/sdp.conf.template
--- a/make/src/classes/build/tools/module/ModuleArchive.java	Wed Oct 15 13:56:18 2014 +0200
+++ b/make/src/classes/build/tools/module/ModuleArchive.java	Wed Oct 15 15:39:32 2014 +0100
@@ -195,7 +195,7 @@
                             path.toFile().setExecutable(true);
                             break;
                         case CONFIGS:
-                            writeEntry(in, destFile("lib", filename));
+                            writeEntry(in, destFile("conf", filename));
                             break;
                         default:
                             throw new InternalError("unexpected entry: " + filename);
--- a/src/java.base/share/classes/sun/net/NetProperties.java	Wed Oct 15 13:56:18 2014 +0200
+++ b/src/java.base/share/classes/sun/net/NetProperties.java	Wed Oct 15 15:39:32 2014 +0100
@@ -62,7 +62,7 @@
             throw new Error("Can't find java.home ??");
         }
         try {
-            File f = new File(fname, "lib");
+            File f = new File(fname, "conf");
             f = new File(f, "net.properties");
             fname = f.getCanonicalPath();
             InputStream in = new FileInputStream(fname);