summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-12 11:44:09 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-12 11:44:09 +0000
commitea6bc1e6afd4c8f902f4e2da3924a90bd1c73ecf (patch)
tree69b3ee6e65aa1fc837e6aaf191c0ddd62faa4d3c
parente591a08dc3d37e13703c855a7f4056faa4e34406 (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
-rw-r--r--cli_ure/source/climaker/climaker.exe.config10
-rw-r--r--cli_ure/source/climaker/makefile.mk11
-rw-r--r--cli_ure/version/version.txt24
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml13
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml6
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml6
-rwxr-xr-xjvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml4
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml6
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx6
-rw-r--r--jvmfwk/source/framework.cxx30
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx7
-rw-r--r--unoil/climaker/version.txt6
12 files changed, 75 insertions, 54 deletions
diff --git a/cli_ure/source/climaker/climaker.exe.config b/cli_ure/source/climaker/climaker.exe.config
new file mode 100644
index 000000000000..5ff03513900c
--- /dev/null
+++ b/cli_ure/source/climaker/climaker.exe.config
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<configuration>
+ <runtime>
+ <gcConcurrent enabled="true" />
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <publisherPolicy apply="no" />
+ <probing privatePath="" />
+ </assemblyBinding>
+ </runtime>
+</configuration> \ No newline at end of file
diff --git a/cli_ure/source/climaker/makefile.mk b/cli_ure/source/climaker/makefile.mk
index 7da7564a147e..51da0d89f547 100644
--- a/cli_ure/source/climaker/makefile.mk
+++ b/cli_ure/source/climaker/makefile.mk
@@ -116,6 +116,17 @@ APP1STDLIBS += \
.INCLUDE : $(PRJ)$/util$/target.pmk
.INCLUDE : target.mk
+CLIMAKER_CONFIG = $(BIN)$/climaker.exe.config
+
+ALLTAR: \
+ $(CLIMAKER_CONFIG)
+
+
+
+#Create the config file that is used with the policy assembly
+$(CLIMAKER_CONFIG): climaker.exe.config
+ $(GNUCOPY) -p $< $@
+
.IF "$(BUILD_FOR_CLI)" != ""
$(OBJFILES): $(BIN)$/cli_basetypes.dll
diff --git a/cli_ure/version/version.txt b/cli_ure/version/version.txt
index 7e81c58e3277..a5b40dde8d0c 100644
--- a/cli_ure/version/version.txt
+++ b/cli_ure/version/version.txt
@@ -29,23 +29,23 @@
#
#*************************************************************************
-CLI_URETYPES_NEW_VERSION=1.0.1.0
-CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.0.0
-CLI_URETYPES_POLICY_VERSION=1.1.0.0
+CLI_URETYPES_NEW_VERSION=1.0.2.0
+CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.1.0
+CLI_URETYPES_POLICY_VERSION=2.0.0.0
CLI_URETYPES_POLICY_ASSEMBLY=policy.1.0.cli_uretypes
-CLI_BASETYPES_NEW_VERSION=1.0.12.0
-CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.11.0
-CLI_BASETYPES_POLICY_VERSION=12.0.0.0
+CLI_BASETYPES_NEW_VERSION=1.0.13.0
+CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.12.0
+CLI_BASETYPES_POLICY_VERSION=13.0.0.0
CLI_BASETYPES_POLICY_ASSEMBLY=policy.1.0.cli_basetypes
-CLI_URE_NEW_VERSION=1.0.15.0
-CLI_URE_OLD_VERSION=1.0.0.0-1.0.14.0
-CLI_URE_POLICY_VERSION=15.0.0.0
+CLI_URE_NEW_VERSION=1.0.16.0
+CLI_URE_OLD_VERSION=1.0.0.0-1.0.15.0
+CLI_URE_POLICY_VERSION=16.0.0.0
CLI_URE_POLICY_ASSEMBLY=policy.1.0.cli_ure
-CLI_CPPUHELPER_NEW_VERSION=1.0.15.0
-CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.14.0
-CLI_CPPUHELPER_POLICY_VERSION=15.0.0.0
+CLI_CPPUHELPER_NEW_VERSION=1.0.16.0
+CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.15.0
+CLI_CPPUHELPER_POLICY_VERSION=16.0.0.0
CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper
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());
}
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 8b528afc953f..78dffbcb9c32 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -1646,11 +1646,12 @@ void OServiceManager::remove( const Any & Element )
OUString( RTL_CONSTASCII_USTRINGPARAM("element is not in!") ),
static_cast< OWeakObject * >(this) );
}
-
- // remove from the implementation map
+ //First remove all factories which have been loaded by ORegistryServiceManager.
+ m_SetLoadedFactories.erase( *aIt);
+ //Remove from the implementation map. It contains all factories of m_SetLoadedFactories
+ //which have been added directly through XSet, that is not via ORegistryServiceManager
m_ImplementationMap.erase( aIt );
- m_SetLoadedFactories.erase( *aIt);
// remove from the implementation name hashmap
Reference<XServiceInfo > xInfo( Reference<XServiceInfo >::query( xEle ) );
if( xInfo.is() )
diff --git a/unoil/climaker/version.txt b/unoil/climaker/version.txt
index 86d9998af42d..bdab589b865d 100644
--- a/unoil/climaker/version.txt
+++ b/unoil/climaker/version.txt
@@ -29,8 +29,8 @@
#
#*************************************************************************
-CLI_OOOTYPES_NEW_VERSION=1.0.1.0
-CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.0.0
-CLI_OOOTYPES_POLICY_VERSION=1.1.0.0
+CLI_OOOTYPES_NEW_VERSION=1.0.2.0
+CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.1.0
+CLI_OOOTYPES_POLICY_VERSION=2.0.0.0
CLI_OOOTYPES_POLICY_ASSEMBLY=policy.1.0.cli_oootypes
generated by cgit (git 2.34.1) at 2024-06-17 15:06:14 +0000