Skip to content

C
core
Kaydet (Commit) ea6bc1e6 authored tarafından Oliver Bolte's avatar Oliver Bolte
Dosyalara gözat
Seçenekler

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
üst e591a08d
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 54 deletions
cli_ure/source/climaker/climaker.exe.config 0 → 100644
Dosyayı görüntüle @ ea6bc1e6
<?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
cli_ure/source/climaker/makefile.mk
Dosyayı görüntüle @ ea6bc1e6
......@@ -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
......
cli_ure/version/version.txt
Dosyayı görüntüle @ ea6bc1e6
......@@ -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
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
Dosyayı görüntüle @ ea6bc1e6
......@@ -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>
......
jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
Dosyayı görüntüle @ ea6bc1e6
......@@ -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>
......
jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
Dosyayı görüntüle @ ea6bc1e6
......@@ -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>
......
jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
Dosyayı görüntüle @ ea6bc1e6
......@@ -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>
......
jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
Dosyayı görüntüle @ ea6bc1e6
......@@ -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>
......
jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
Dosyayı görüntüle @ ea6bc1e6
......@@ -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
......
jvmfwk/source/framework.cxx
Dosyayı görüntüle @ ea6bc1e6
......@@ -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());
}
......
stoc/source/servicemanager/servicemanager.cxx
Dosyayı görüntüle @ ea6bc1e6
......@@ -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() )
......
unoil/climaker/version.txt
Dosyayı görüntüle @ ea6bc1e6
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment