diff options
author | Oliver Bolte <obo@openoffice.org> | 2009-02-12 11:44:09 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2009-02-12 11:44:09 +0000 |
commit | ea6bc1e6afd4c8f902f4e2da3924a90bd1c73ecf (patch) | |
tree | 69b3ee6e65aa1fc837e6aaf191c0ddd62faa4d3c /jvmfwk | |
parent | e591a08dc3d37e13703c855a7f4056faa4e34406 (diff) |
CWS-TOOLING: integrate CWS jl115
2009-01-29 13:13:16 +0100 jsk r267121 : #i98596#
2009-01-23 14:50:24 +0100 jl r266821 : #98273# climaker.exe.config prevents using publisher policy
2009-01-23 14:10:51 +0100 jl r266817 : #i98392# wrong use of iterator when removing a factory, which may lead to a crash
2009-01-19 11:36:29 +0100 jl r266484 : #i96690# test extension
2009-01-19 11:32:46 +0100 jl r266483 : #i96690#
2009-01-16 17:09:19 +0100 jl r266439 : #i96690# ignore duplicate path URLs in manifest.xml. These may be introduces by copy/paste and lead to nasty errors
2009-01-16 14:04:00 +0100 jl r266416 : #i92032# increasing minimum version of Java
2009-01-16 10:57:02 +0100 jl r266407 : #i96816# compiler warning breaks build
2009-01-15 16:58:54 +0100 jl r266384 : #i94938# patch from cmc.
2009-01-15 16:35:18 +0100 jl r266383 : #i95838# applying patch
2009-01-15 16:15:58 +0100 jl r266381 : #i70855# #i96102# WaitForMultipleObjects wrong implemented
2009-01-14 12:46:21 +0100 jl r266287 : #i98038# increased assembly versions
2009-01-14 12:44:55 +0100 jl r266285 : #i98038# increased assembly versions
2009-01-13 17:11:20 +0100 jl r266239 : #i98038# new test library for assemblies from 3.0.1
Diffstat (limited to 'jvmfwk')
7 files changed, 35 insertions, 36 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index e62f482ab5ff..f3bf44addc25 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -3,24 +3,23 @@ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <updated>2004-01-30</updated> + <updated>2008-01-16</updated> <vendorInfos> <vendor name="Sun Microsystems Inc."> - <minVersion>1.3.1</minVersion> + <minVersion>1.5.0</minVersion> </vendor> <vendor name="IBM Corporation"> - <minVersion>1.3.1</minVersion> - <maxVersion>1.4.2</maxVersion> + <minVersion>1.5.0</minVersion> </vendor> <vendor name="Blackdown Java-Linux Team"> - <minVersion>1.3.1</minVersion> + <minVersion>1.5.0</minVersion> </vendor> <vendor name="Free Software Foundation, Inc."> - <minVersion>1.4.2</minVersion> + <minVersion>1.5.0</minVersion> </vendor> <vendor name="BEA Systems, Inc."> - <minVersion>1.4.1</minVersion> + <minVersion>1.5.0</minVersion> </vendor> </vendorInfos> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml index 1cf20d535c30..1d7894a11025 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml @@ -3,14 +3,14 @@ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <updated>2006-05-02</updated> + <updated>2008-01-16</updated> <vendorInfos> <vendor name="Apple Computer, Inc."> - <minVersion>1.3.1</minVersion> + <minVersion>1.5.0</minVersion> </vendor> <vendor name="Apple Inc."> - <minVersion>1.3.1</minVersion> + <minVersion>1.5.0</minVersion> </vendor> </vendorInfos> <plugins> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml index 89f896104f89..5ba2eaf76251 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml @@ -3,14 +3,14 @@ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <updated>2004-01-30</updated> + <updated>2008-01-16</updated> <vendorInfos> <vendor name="Sun Microsystems Inc."> - <minVersion>1.3.1</minVersion> + <minVersion>1.5.0</minVersion> </vendor> <vendor name="IBM Corporation"> - <minVersion>1.3.1</minVersion> + <minVersion>1.5.0</minVersion> </vendor> </vendorInfos> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml index 187a1d39f10c..b9b8296edf8f 100755 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml @@ -3,11 +3,11 @@ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <updated>2004-01-30</updated> + <updated>2008-01-16</updated> <vendorInfos> <vendor name="Sun Microsystems Inc."> - <minVersion>1.3.1</minVersion> + <minVersion>1.5.0</minVersion> </vendor> </vendorInfos> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index c97b5b4f89b4..47a5800659ca 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -3,14 +3,14 @@ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <updated>2004-01-30</updated> + <updated>2008-01-16</updated> <vendorInfos> <vendor name="Sun Microsystems Inc."> - <minVersion>1.3.1</minVersion> + <minVersion>1.5.0</minVersion> </vendor> <vendor name="IBM Corporation"> - <minVersion>1.3.1</minVersion> + <minVersion>1.5.0</minVersion> </vendor> </vendorInfos> diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index c1c64713814d..c80d1c091571 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -74,12 +74,12 @@ char const* const* OtherInfo::getRuntimePaths(int * size) #ifdef MACOSX "/../../../JavaVM" #else - "/bin/classic/libjvm.so", // for IBM Java - "/jre/bin/classic/libjvm.so", // for IBM Java "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64 "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC - "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so" // for Java of BEA Systems + "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", // for Java of BEA Systems + "/bin/classic/libjvm.so", // fallback for older for IBM Java + "/jre/bin/classic/libjvm.so" // fallback for older for IBM Java #endif #endif diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 9f3d67cfabda..75a20ac98ff3 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -242,7 +242,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi catch (jfw::FrameworkException& e) { retVal = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } return retVal; @@ -420,7 +420,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } @@ -629,7 +629,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } @@ -718,7 +718,7 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo) catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } return errcode; @@ -846,7 +846,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } @@ -880,7 +880,7 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo) catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } return errcode; @@ -913,7 +913,7 @@ javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled) catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } return errcode; @@ -935,7 +935,7 @@ javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled) catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } return errcode; @@ -960,7 +960,7 @@ javaFrameworkError SAL_CALL jfw_setVMParameters( catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } @@ -985,7 +985,7 @@ javaFrameworkError SAL_CALL jfw_getVMParameters( catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } return errcode; @@ -1008,7 +1008,7 @@ javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCp) catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } return errcode; @@ -1031,7 +1031,7 @@ javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP) catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } return errcode; @@ -1055,7 +1055,7 @@ javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation) catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } @@ -1081,7 +1081,7 @@ javaFrameworkError SAL_CALL jfw_setJRELocations( catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } return errcode; @@ -1106,7 +1106,7 @@ javaFrameworkError SAL_CALL jfw_getJRELocations( catch (jfw::FrameworkException& e) { errcode = e.errorCode; - fprintf(stderr, e.message.getStr()); + fprintf(stderr, "%s\n", e.message.getStr()); OSL_ENSURE(0, e.message.getStr()); } |