X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fproperties.cpp;h=cb49e96acbc5db6af3f41ba89675037584ca3c59;hb=c7982045b8e1a27aca0c14398bd17a90f88ae8cc;hp=333606976253142104383e2585d28f698690f880;hpb=3c1d162e9da1dfaf584573ff80841b4b35635790;p=cacao.git

diff --git a/src/vm/properties.cpp b/src/vm/properties.cpp
index 333606976..cb49e96ac 100644
--- a/src/vm/properties.cpp
+++ b/src/vm/properties.cpp
@@ -32,17 +32,14 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <sys/utsname.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 
-#include "toolbox/util.h"
-
-#include "vm/class.h"
+#include "vm/class.hpp"
 #include "vm/global.h"
-#include "vm/method.h"
+#include "vm/method.hpp"
 #include "vm/options.h"
 #include "vm/os.hpp"
 #include "vm/properties.hpp"
@@ -317,7 +314,7 @@ Properties::Properties()
 	put("java.vm.specification.version", "1.0");
 	put("java.vm.specification.vendor", "Sun Microsystems Inc.");
 	put("java.vm.specification.name", "Java Virtual Machine Specification");
-	put("java.vm.version", VERSION);
+	put("java.vm.version", VERSION_FULL);
 	put("java.vm.vendor", "CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO");
 	put("java.vm.name", "CACAO");
 
@@ -332,14 +329,14 @@ Properties::Properties()
 	{
 		/* XXX We don't support java.lang.Compiler */
 /*  		put("java.compiler", "cacao.jit"); */
-		put("java.vm.info", "JIT mode");
+		put("java.vm.info", "compiled mode");
 	}
 
 # if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 
 	/* Get properties from system. */
 
-	char* cwd      = _Jv_getcwd();
+	char* cwd      = os::getcwd();
 
 	char* env_user = os::getenv("USER");
 	char* env_home = os::getenv("HOME");
@@ -349,7 +346,7 @@ Properties::Properties()
 
 	uname(utsnamebuf);
 
-	put("java.runtime.version", VERSION);
+	put("java.runtime.version", VERSION_FULL);
 	put("java.runtime.name", "CACAO");
 
 	put("java.specification.version", "1.5");
@@ -650,13 +647,6 @@ void Properties::dump()
 #endif
 
 
-// Legacy C interface.
-extern "C" {
-	void        Properties_put(const char *key, const char *value) { VM::get_current()->get_properties().put(key, value); }
-	const char *Properties_get(const char *key) { return VM::get_current()->get_properties().get(key); }
-}
-
-
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where