/hg/icedtea6: 4 new changesets
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Thu Jul 1 06:23:28 PDT 2010
changeset ffd5f9e8887d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ffd5f9e8887d
author: Omair Majid <omajid at redhat.com>
date: Tue Jun 29 14:19:38 2010 -0400
Netx: make path sanitization consistent; use a blacklisting
approach.
2010-06-29 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/cache/CacheUtil.java
(urlToPath): Call FileUtils.sanitizePath. (fixPath): Moved to...
* netx/net/sourceforge/jnlp/util/FileUtils.java (sanitizePath):
New function. Moved from CacheUtil.java (sanitizeFileName): Use
a blacklisting approach rather than a whitelisting approach:
should work better with non ascii filenames.
changeset e7c3958eee03 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e7c3958eee03
author: Omair Majid <omajid at redhat.com>
date: Tue Jun 29 14:26:57 2010 -0400
Netx: make the SingleInstanceServer thread a daemon thread
2010-06-29 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/services/XSingleInstanceService.java
(startListeningServer): Mark the thread as a daemon so the JVM can
shutdown if there are no other non-daemon thread running.
changeset fc215b8f9b18 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fc215b8f9b18
author: Omair Majid <omajid at redhat.com>
date: Tue Jun 29 15:48:10 2010 -0400
Netx: allow jnlp classloaders to share native libraries 2010-06-29
Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
nativeDirectories: New variable. Contains a list of directories that
contain native libraries. (getInstance): Tell other classloaders
about the native directory. (getNativeDir): Add the new native
directory to nativeDirectories. (addNativeDirectory): New
function. (getNativeDirectories): New function.
(findLibrary): Look in all the native directories for the native
library.
changeset 7649271c60ab in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7649271c60ab
author: Omair Majid <omajid at redhat.com>
date: Wed Jun 30 19:15:49 2010 -0400
Merge
diffstat:
8 files changed, 281 insertions(+), 91 deletions(-)
ChangeLog | 70 +++++
Makefile.am | 122 ++++++----
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 17 -
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 56 +++-
netx/net/sourceforge/jnlp/services/XSingleInstanceService.java | 11
netx/net/sourceforge/jnlp/util/FileUtils.java | 51 +++-
patches/debug-dir.patch | 31 ++
patches/no-sync.patch | 14 +
diffs (truncated from 661 to 500 lines):
diff -r fa1c6854f1e6 -r 7649271c60ab ChangeLog
--- a/ChangeLog Mon Jun 28 14:18:16 2010 +0100
+++ b/ChangeLog Wed Jun 30 19:15:49 2010 -0400
@@ -1,3 +1,73 @@ 2010-06-25 Andrew John Hughes <ahughes@
+2010-06-30 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ nativeDirectories: New variable. Contains a list of directories that
+ contain native libraries.
+ (getInstance): Tell other classloaders about the native directory.
+ (getNativeDir): Add the new native directory to nativeDirectories.
+ (addNativeDirectory): New function.
+ (getNativeDirectories): New function.
+ (findLibrary): Look in all the native directories for the native library.
+
+2010-06-30 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/services/XSingleInstanceService.java
+ (startListeningServer): Mark the thread as a daemon so the JVM can
+ shutdown if there are no other non-daemon thread running.
+
+2010-06-30 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/cache/CacheUtil.java
+ (urlToPath): Call FileUtils.sanitizePath.
+ (fixPath): Moved to...
+ * netx/net/sourceforge/jnlp/util/FileUtils.java
+ (sanitizePath): New function. Moved from CacheUtil.java
+ (sanitizeFileName): Use a blacklisting approach rather than a whitelisting
+ approach: should work better with non ascii filenames.
+
+2010-06-30 Andrew John Hughes <ahughes at redhat.com>
+
+ PR icedtea/93
+ * Makefile.am: Fix cleanup process.
+ (clean-local): Renamed from distclean-local.
+ Add additional dependent clean targets.
+ Don't remove build directories and stamps;
+ should be done by dependents.
+ (.PHONY): Updated.
+ (clean-ports): Inverse of ports.stamp.
+ (clean-overlay): Inverse of overlay.stamp.
+ (clean-native-ecj): Inverse of native-ecj.stamp.
+ (clean-icedtea): Just delete the build directory and stamp.
+ (clean-icedtea-debug): Inverse of icedtea-debug.stamp.
+ (clean-icedtea-against-icedtea): Inverse of icedtea-against-icedtea.stamp
+ (clean-icedtea-debug-against-icedtea): Inverse of icedtea-debug-against-icedtea.stamp
+ (clean-icedtea-ecj): Just delete the build directory and stamp.
+ (clean-icedtea-against-ecj): Inverse of icedtea-against-ecj.stamp.
+ (clean-IcedTeaPlugin): Delete empty build directories if srcdir != builddir.
+ (clean-pulse-java): Likewise.
+ (clean-add-cacao): Inverse of add-cacao.stamp.
+ (clean-add-cacao-debug): Inverse of add-cacao-debug.stamp.
+ (clean-add-zero): Inverse of add-zero.stamp.
+ (clean-add-zero-debug): Inverse of add-zero-debug.stamp.
+ (clean): Removed; already provided by autoconf to point to clean-local.
+
+2010-06-29 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * patches/no-sync.patch: Don't pass --sync
+ to df; the file space check does not need
+ to be so accurate that we have to flush all
+ buffers to disc.
+
+2010-06-28 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_DEBUG_BUILD_TARGET): Don't add
+ debug suffix, OpenJDK makefile already does this.
+ * patches/debug-dir.patch: Fix OpenJDK
+ Makefile to just add the debug suffix and
+ not move it to ../$(OS)-$(ARCH)-debug.
+
2010-06-25 Andrew John Hughes <ahughes at redhat.com>
Remove VisualVM support, now maintained at
diff -r fa1c6854f1e6 -r 7649271c60ab Makefile.am
--- a/Makefile.am Mon Jun 28 14:18:16 2010 +0100
+++ b/Makefile.am Wed Jun 30 19:15:49 2010 -0400
@@ -92,8 +92,6 @@ ICEDTEA_BOOTSTRAP_CLASSES = \
$(SHARE)/javax/management/StandardMBean.java \
$(NETX_BOOTSTRAP_CLASSES)
-# FIXME (javac): Settings for javac go here
-
# Flags
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
@@ -155,12 +153,11 @@ else
MEMORY_LIMIT =
endif
-ICEDTEA_DEBUG_BUILD_TARGET=ALT_OUTPUTDIR="$(DEBUG_BUILD_OUTPUT_DIR)"
if WITH_CACAO
ICEDTEA_BUILD_TARGET=jdk_only
- ICEDTEA_DEBUG_BUILD_TARGET += jdk_fastdebug_only
+ ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only
else
- ICEDTEA_DEBUG_BUILD_TARGET += debug_build
+ ICEDTEA_DEBUG_BUILD_TARGET = debug_build
endif
# FIXME (bootstrap): Assumption is WITH_OPENJDK == no bootstrap
@@ -289,7 +286,9 @@ ICEDTEA_PATCHES = \
patches/icedtea-jtreg-httpTest.patch \
patches/arm.patch \
patches/shark-debug-option.patch \
- patches/openjdk/6961732.patch
+ patches/openjdk/6961732.patch \
+ patches/debug-dir.patch \
+ patches/no-sync.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -518,27 +517,18 @@ all-local: icedtea-against-icedtea
check-local: jtregcheck
-#FIXME (clean): Should become clean-local.
-distclean-local: clean-copy clean-jtreg clean-jtreg-reports $(PULSE_JAVA_CLEAN_TARGET) \
- clean-netx clean-plugin clean-liveconnect
- rm -rf stamps
- rm -f rt-source-files.txt \
- extra-source-files.txt
+clean-local: clean-jtreg clean-jtreg-reports $(PULSE_JAVA_CLEAN_TARGET) \
+ clean-netx clean-plugin clean-liveconnect clean-icedtea clean-icedtea-debug \
+ clean-icedtea-ecj clean-cacao clean-ports clean-overlay clean-native-ecj \
+ clean-icedtea-against-icedtea clean-icedtea-debug-against-icedtea \
+ clean-icedtea-against-ecj
+ rm -f rt-source-files.txt extra-source-files.txt
rm -rf bootstrap
rm -rf lib
rm -rf extra-lib
rm -rf openjdk-ecj
- rm -rf $(ECJ_BUILD_OUTPUT_DIR)
rm -rf openjdk
- rm -rf $(BUILD_OUTPUT_DIR)
-
-if BUILD_CACAO
- rm -rf cacao
-endif
rm -f jni-common.o
-if ADD_ZERO_BUILD
- rm -rf zerovm
-endif
#FIXME (clean): Missing distclean-local for downloads only
@@ -551,7 +541,10 @@ install:
clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
clean-icedtea icedtea-against-icedtea clean-icedtea-ecj \
clean-tools-jar clean-copy clean-rt $(ICEDTEAPLUGIN_CLEAN) hotspot \
- hotspot-helper clean-extra clean-jtreg clean-jtreg-reports
+ hotspot-helper clean-extra clean-jtreg clean-jtreg-reports \
+ clean-add-zero clean-add-zero-debug clean-icedtea clean-icedtea-debug
+ clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \
+ clean-ports clean-overlay
env:
@echo 'unset JAVA_HOME'
@@ -853,7 +846,17 @@ stamps/ports.stamp: stamps/replace-hotsp
mkdir -p stamps
touch stamps/ports.stamp
-#FIXME (clean): Missing clean-ports
+clean-ports:
+ for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
+ $(abs_top_srcdir)/ports/hotspot/tools \
+ $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
+ $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
+ link=$$(echo $$target | sed 's/^.*ports/openjdk/'); \
+ rm -rf $$link; \
+ done
+ rm -f openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg
+ rm -f openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c
+ rm -f stamps/ports.stamp
#FIXME (missing): Missing generated.stamp
@@ -988,7 +991,8 @@ endif
endif
touch stamps/overlay.stamp
-#FIXME (clean): Missing clean-overlay
+clean-overlay:
+ rm -f stamps/overlay.stamp
# OpenJDK ecj Source Preparation Targets
# ======================================
@@ -1069,7 +1073,9 @@ stamps/native-ecj.stamp:
fi ; \
touch stamps/native-ecj.stamp
-# FIXME(clean): Missing clean-native-ecj
+clean-native-ecj:
+ rm -f native-ecj
+ rm -rf stamps/native-ecj.stamp
# bootstrap/ecj.
stamps/bootstrap-directory-ecj.stamp: stamps/native-ecj.stamp
@@ -1235,6 +1241,10 @@ endif
mkdir -p stamps
touch stamps/icedtea.stamp
+clean-icedtea:
+ rm -rf $(BUILD_OUTPUT_DIR)
+ rm -f stamps/icedtea.stamp
+
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \
@@ -1308,25 +1318,25 @@ endif
mkdir -p stamps
touch stamps/icedtea-debug.stamp
-clean-icedtea: stamps/extract.stamp
- $(ARCH_PREFIX) $(MAKE) \
- $(ICEDTEA_ENV) \
- -C openjdk clobber
- rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
+clean-icedtea-debug:
+ rm -rf $(DEBUG_BUILD_OUTPUT_DIR)
+ rm -f stamps/icedtea-debug.stamp
stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp
mkdir -p stamps
touch stamps/icedtea-against-icedtea.stamp
-#FIXME (clean): Missing clean-icedtea-against-icedtea
+clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao
+ rm -f stamps/icedtea-against-icedtea.stamp
stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp
mkdir -p stamps
touch stamps/icedtea-debug-against-icedtea.stamp
-#FIXME (clean): Missing clean-icedtea-debug-against-icedtea
+clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug
+ rm -f stamps/icedtea-debug-against-icedtea.stamp
# OpenJDK ecj Targets
# ===================
@@ -1342,6 +1352,10 @@ stamps/icedtea-ecj.stamp: stamps/bootstr
$(ECJ_BUILD_OUTPUT_DIR)
mkdir -p stamps
touch stamps/icedtea-ecj.stamp
+
+clean-icedtea-ecj: stamps/extract-ecj.stamp
+ rm -rf $(ECJ_BUILD_OUTPUT_DIR)
+ rm -f stamps/icedtea-ecj.stamp
hotspot:
if WITH_OPENJDK
@@ -1364,19 +1378,14 @@ else
@echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
endif
-clean-icedtea-ecj: stamps/extract-ecj.stamp
- rm -f stamps/icedtea-ecj.stamp
- $(ARCH_PREFIX) $(MAKE) \
- $(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/ clobber
-
stamps/icedtea-against-ecj.stamp: \
stamps/bootstrap-directory-symlink-ecj.stamp \
stamps/icedtea-ecj.stamp
mkdir -p stamps
touch stamps/icedtea-against-ecj.stamp
-#FIXME (clean): Missing clean-icedtea-against-ecj
+clean-icedtea-against-ecj:
+ rm -f stamps/icedtea-against-ecj.stamp
# Plugin
@@ -1418,6 +1427,10 @@ clean-IcedTeaPlugin:
clean-IcedTeaPlugin:
rm -f $(PLUGIN_DIR)/*.o
rm -f $(PLUGIN_DIR)/IcedTeaPlugin.so
+ if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
+ rmdir $(abs_top_builddir)/plugin/icedteanp ; \
+ rmdir $(abs_top_builddir)/plugin ; \
+ fi
endif
stamps/plugin.stamp: $(ICEDTEAPLUGIN_TARGET)
@@ -1580,6 +1593,9 @@ clean-pulse-java:
[ -z "$(PULSE_JAVA_CLASS_DIR)" ] || rm -rf $(PULSE_JAVA_CLASS_DIR)
rm -f stamps/pulse-java*.stamp
rm -f pulse-java.jar
+ if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
+ rmdir $(abs_top_builddir)/pulseaudio ; \
+ fi
endif
# end of pulse-java
@@ -1663,7 +1679,10 @@ endif
endif
touch $@
-#FIXME (clean): Missing clean-add-cacao
+clean-add-cacao:
+ rm -rf $(BUILD_JRE_ARCH_DIR)/cacao
+ sed -i 's#-cacao KNOWN#-cacao ERROR#' jvm.cfg
+ rm -f stamps/add-cacao.stamp
stamps/add-cacao-debug.stamp: stamps/icedtea-debug.stamp stamps/cacao.stamp
if ADD_CACAO_BUILD
@@ -1680,7 +1699,10 @@ endif
endif
touch $@
-#FIXME (clean): Missing clean-add-cacao-debug
+clean-add-cacao-debug:
+ rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao
+ sed -i 's#-cacao KNOWN#-cacao ERROR#' jvm.cfg
+ rm -f stamps/add-cacao-debug.stamp
# configure script arguments, quoted in single quotes
CONFIGURE_ARGS = @CONFIGURE_ARGS@
@@ -1742,7 +1764,13 @@ endif
endif
touch $@
-#FIXME (clean): Missing clean-add-zero
+clean-add-zero:
+ rm -rf $(BUILD_JRE_ARCH_DIR)/zero
+ rm -rf $(BUILD_JRE_ARCH_DIR)/shark
+ rm -rf zerovm
+ sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg
+ sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg
+ rm -f stamps/add-zero.stamp
stamps/add-zero-debug.stamp: stamps/icedtea-debug.stamp
if ADD_ZERO_BUILD
@@ -1772,7 +1800,13 @@ endif
endif
touch $@
-#FIXME (clean): Missing clean-add-zero-debug
+clean-add-zero-debug:
+ rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/zero
+ rm -rf $(BUILD_JRE_ARCH_DIR)/shark
+ rm -rf zerovm
+ sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg
+ sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg
+ rm -f stamps/add-zero-debug.stamp
# end additional VMs
@@ -1941,8 +1975,6 @@ bootstrap-directory-symlink: stamps/boot
cacao: stamps/cacao.stamp
-clean: distclean-local
-
nbplatform: stamps/nbplatform.stamp
download: stamps/download.stamp
diff -r fa1c6854f1e6 -r 7649271c60ab netx/net/sourceforge/jnlp/cache/CacheUtil.java
--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java Mon Jun 28 14:18:16 2010 +0100
+++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java Wed Jun 30 19:15:49 2010 -0400
@@ -26,6 +26,7 @@ import javax.jnlp.*;
import net.sourceforge.jnlp.*;
import net.sourceforge.jnlp.runtime.*;
+import net.sourceforge.jnlp.util.FileUtils;
/**
* Provides static methods to interact with the cache, download
@@ -300,23 +301,9 @@ public class CacheUtil {
path.append(File.separatorChar);
path.append(location.getPath().replace('/', File.separatorChar));
- return new File(JNLPRuntime.getBaseDir(), fixPath(path.toString()));
+ return new File(JNLPRuntime.getBaseDir(), FileUtils.sanitizePath(path.toString()));
}
- /**
- * Clean up a string by removing characters that can't appear in
- * a local file name.
- */
- private static String fixPath(String path) {
- char badChars[] = { '\\', '/', ':', '*', '?', '"', '<', '>', '|' };
-
- for (int i=0; i < badChars.length; i++)
- if (badChars[i] != File.separatorChar)
- if (-1 != path.indexOf(badChars[i]))
- path = path.replace(badChars[i], 'X');
-
- return path;
- }
/**
* Waits until the resources are downloaded, while showing a
diff -r fa1c6854f1e6 -r 7649271c60ab netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon Jun 28 14:18:16 2010 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Jun 30 19:15:49 2010 -0400
@@ -32,6 +32,7 @@ import java.security.Permissions;
import java.security.Permissions;
import java.security.PrivilegedAction;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.LinkedList;
@@ -82,6 +83,9 @@ public class JNLPClassLoader extends URL
/** the directory for native code */
private File nativeDir = null; // if set, some native code exists
+
+ /** a list of directories that contain native libraries */
+ private List<File> nativeDirectories = Collections.synchronizedList(new LinkedList<File>());
/** security context */
private AccessControlContext acc = AccessController.getContext();
@@ -237,18 +241,22 @@ public class JNLPClassLoader extends URL
// loader for this unique key. Check.
JNLPClassLoader extLoader = (JNLPClassLoader) urlToLoader.get(uniqueKey);
- if (extLoader != null) {
+ if (extLoader != null && extLoader != loader) {
for (URL u : loader.getURLs())
extLoader.addURL(u);
+ for (File nativeDirectory: loader.getNativeDirectories())
+ extLoader.addNativeDirectory(nativeDirectory);
loader = extLoader;
}
// loader is now current + ext. But we also need to think of
// the baseLoader
- if (baseLoader != null) {
+ if (baseLoader != null && baseLoader != loader) {
for (URL u : loader.getURLs())
baseLoader.addURL(u);
+ for (File nativeDirectory: loader.getNativeDirectories())
+ baseLoader.addNativeDirectory(nativeDirectory);
loader = baseLoader;
}
@@ -716,29 +724,47 @@ public class JNLPClassLoader extends URL
if (!nativeDir.mkdirs())
return null;
- else
+ else {
+ // add this new native directory to the search path
+ addNativeDirectory(nativeDir);
return nativeDir;
+ }
+ }
+
+ /**
+ * Adds the {@link File} to the search path of this {@link JNLPClassLoader}
+ * when trying to find a native library
+ */
+ protected void addNativeDirectory(File nativeDirectory) {
+ nativeDirectories.add(nativeDirectory);
+ }
+
+ /**
+ * Returns a list of all directories in the search path of the current classloader
+ * when it tires to find a native library.
+ * @return a list of directories in the search path for native libraries
+ */
+ protected List<File> getNativeDirectories() {
+ return nativeDirectories;
}
/**
* Return the absolute path to the native library.
*/
protected String findLibrary(String lib) {
- if (nativeDir == null)
- return null;
-
String syslib = System.mapLibraryName(lib);
- File target = new File(nativeDir, syslib);
- if (target.exists())
- return target.toString();
- else {
- String result = super.findLibrary(lib);
- if (result != null)
- return result;
+ for (File dir: getNativeDirectories()) {
+ File target = new File(dir, syslib);
+ if (target.exists())
+ return target.toString();
+ }
- return findLibraryExt(lib);
- }
+ String result = super.findLibrary(lib);
+ if (result != null)
+ return result;
More information about the distro-pkg-dev
mailing list