* src/vm/vm.c (version): Print default and runtime classpath

variables.
(vm_create): Add a default java.endorsed.dirs property.

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 3676003f3d84d0a3282dc93b67baf6c191ec28f9..3685969a33a7f56ac5bd8d86244919281c23096b 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -468,7 +468,14 @@ static void version(void)
 #else
        puts("  CC         : "VERSION_CC"");
 #endif
-       puts("  CFLAGS     : "VERSION_CFLAGS"");
+       puts("  CFLAGS     : "VERSION_CFLAGS"\n");
+
+       puts("Default classpath variables:\n");
+       puts("  java.boot.class.path    : "CACAO_VM_ZIP_PATH":"CLASSPATH_GLIBJ_ZIP_PATH"");
+       puts("  java.library.path       : "CLASSPATH_LIBRARY_PATH"\n");
+
+       puts("Runtime classpath variables:\n");
+       printf("  java.boot.class.path    : %s\n", bootclasspath);
 }
 
 
@@ -594,6 +601,11 @@ bool vm_create(JavaVMInitArgs *vm_args)
                throw_cacao_exception_exit(string_java_lang_InternalError,
                                                                   "Unable to init properties");
 
+       /* add some default properties */
+
+       properties_add("java.endorsed.dirs", ""CACAO_PREFIX"/jre/lib/endorsed");
+
+
        /* iterate over all passed options */
 
        while ((opt = options_get(opts, vm_args)) != OPT_DONE) {
@@ -639,7 +651,7 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        /* if no '=' is given, just create an empty property */
 
                        properties_add(opt_arg, "");
-                                       
+
                didit:
                        break;