Florian Effenberger wrote:
just found out that beta2 has a few more links to OOo servers - patch eliding those attached. Do we want to redirect those from documentfoundation.org, or disable the functionality? (and after that, there's the story around helpcontent, and sdk)I propose that for beta3, we go for .libreoffice.org - all links (including templates, extensions etc.) are more product related. Can you send me a list of all links we currently have + their meanings, so we can come up with senseful names and I can add them to our DNS and provide the sites?
Yeah, I think that's cleaner even - updated patch attached, that changes the already-existing tdf links to libreoffice - except for those explicitely referencing TDF (like vendor). Will push if there are no substantial objections. :) (will deal with the readmes etc. separately) Cheers, -- Thorsten
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
index a3f1a37..ff1f640 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
@@ -200,7 +200,7 @@ IMPL_LINK( OExtensionNotPresentDialog, Download_Click, PushButton*, EMPTYARG )
if (suDownloadURL.getLength() == 0)
{
// fallback
- suDownloadURL = UNISTRING("http://extensions.documentfoundation.org";);
+ suDownloadURL = UNISTRING("http://extensions.libreoffice.org";);
}
// open such URL in a browser
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 0aa9562..ce1ac92 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -23,8 +23,8 @@ Globals
USE_FILEVERSION 1
LIBRARYVERSION 9.3.0
POOLPRODUCT 1
- REGISTRATION_HOST https://registration.documentfoundation.org/RegistrationWeb
- REGISTRATIONURL http://survey.documentfoundation.org/user/index.php
+ REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
+ REGISTRATIONURL http://survey.libreoffice.org/user/index.php
PROGRESSBARCOLOR 126,170,23
PROGRESSSIZE 320,7
PROGRESSPOSITION 185,206
@@ -64,8 +64,8 @@ LibreOffice
ABOUTBOXPRODUCTVERSION 3.3.0
BASEPRODUCTVERSION 3.3
PCPFILENAME openoffice.pcp
- UPDATEURL
http://update.documentfoundation.org/ProductUpdateService/check.Update
- ODFNOTIFYURL
http://odfnotify.documentfoundation.org/OOo3.0/notification.jsp?version=ODF
+ UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+ ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
@@ -94,13 +94,13 @@ LibreOffice
DOWNLOADBITMAP ooobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
- STARTCENTER_INFO_URL http://www.documentfoundation.org/
- STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
REGISTRATION_PRODUCT LibreOffice
REGISTRATION_CID 926117
- DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
+ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
active 1
compression 5
@@ -128,8 +128,8 @@ LibreOffice_wJRE
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.3.0
BASEPRODUCTVERSION 3.3
- UPDATEURL
http://update.documentfoundation.org/ProductUpdateService/check.Update
- ODFNOTIFYURL
http://odfnotify.documentfoundation.org/OOo3.0/notification.jsp?version=ODF
+ UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+ ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
@@ -160,13 +160,13 @@ LibreOffice_wJRE
DOWNLOADBITMAP ooobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
- STARTCENTER_INFO_URL http://www.documentfoundation.org/
- STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
REGISTRATION_PRODUCT LibreOffice
REGISTRATION_CID 926117
- DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
+ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
active 1
compression 5
@@ -201,8 +201,8 @@ LibreOffice_Dev
SOLSUREPACKAGEPREFIX lodev
REGISTRYLAYERNAME LayerDev
SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
- UPDATEURL
http://update.documentfoundation.org/ProductUpdateService/check.Update
- ODFNOTIFYURL
http://odfnotify.documentfoundation.org/OOo3.0/notification.jsp?version=ODF
+ UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+ ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
EVAL
FILEFORMATNAME OpenOffice.org
@@ -232,13 +232,13 @@ LibreOffice_Dev
DOWNLOADSETUPICO ooosetup.ico
LOCALUSERDIR $ORIGIN/..
RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
- STARTCENTER_INFO_URL http://www.documentfoundation.org/
- STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
REGISTRATION_PRODUCT LibreOffice
REGISTRATION_CID 926117
- DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
+ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
active 1
compression 5
@@ -276,13 +276,13 @@ URE
DONTUSESTARTMENUFOLDER 1
SERVICESPROJEKT 1
RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
- STARTCENTER_INFO_URL http://www.documentfoundation.org/
- STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst
PACKAGEMAP package_names_ext.txt
- DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
+ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
active 1
compression 5
@@ -323,11 +323,11 @@ LibreOffice_SDK
DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
- STARTCENTER_INFO_URL http://www.documentfoundation.org/
- STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
- DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
+ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
active 1
compression 5
@@ -375,11 +375,11 @@ LibreOffice_Dev_SDK
DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
- STARTCENTER_INFO_URL http://www.documentfoundation.org/
- STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
- DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
+ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
active 1
compression 5
diff --git a/instsetoo_native/util/update.xml b/instsetoo_native/util/update.xml
index 8b8a4dc..832de6b 100644
--- a/instsetoo_native/util/update.xml
+++ b/instsetoo_native/util/update.xml
@@ -6,5 +6,5 @@
<inst:buildid></inst:buildid>
<inst:os></inst:os>
<inst:arch></inst:arch>
- <inst:update type="text/html" src="http://update.services.openoffice.org/ooo/snapshot.html"; />
+ <inst:update type="text/html" src="http://update.libreoffice.org/ooo/snapshot.html"; />
</inst:description>
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index c5b07c4..5734a4b 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1230,7 +1230,7 @@ ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
Section = "Version";
Order = 18;
Key = "ExtensionUpdateURL";
- Value = "http://updateexte.services.openoffice.org/ExtensionUpdateService/check.Update";;
+ Value = "http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update";;
End
ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index 47df5f2..b3ac387 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -46,7 +46,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
Order = 8;
Key = "ErrorReportServer";
#if defined(BUILD_SPECIAL)
- Value = "report.services.openoffice.org";
+ Value = "report.libreoffice.org";
#else
Value = "";
#endif
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 787244a..6aa7c4e 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -206,7 +206,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
ModuleID = gid_Module_Root;
Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
Name = "HelpLink";
- Value = "http://www.documentfoundation.org";;
+ Value = "http://www.libreoffice.org";;
End
RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Modifypath
@@ -238,7 +238,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
ModuleID = gid_Module_Root;
Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
Name = "URLInfoAbout";
- Value = "http://www.documentfoundation.org/";;
+ Value = "http://www.libreoffice.org/";;
End
RegistryItem
gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Urlupdateinfo
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 5ef6d4f..727398f 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1173,7 +1173,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
!= SvtExtendedSecurityOptions::OPEN_NEVER )
{
aMoreDictsLink.SetURL( String(
- RTL_CONSTASCII_STRINGPARAM( "http://extensions.documentfoundation.org/dictionary/"; ) )
);
+ RTL_CONSTASCII_STRINGPARAM( "http://extensions.libreoffice.org/dictionary/"; ) ) );
aMoreDictsLink.SetClickHdl( LINK( this, SvxLinguTabPage, OpenURLHdl_Impl ) );
}
else
@@ -2071,7 +2071,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl&
rData)
!= SvtExtendedSecurityOptions::OPEN_NEVER )
{
aMoreDictsLink.SetURL( String(
- RTL_CONSTASCII_STRINGPARAM( "http://extensions.documentfoundation.org/dictionary/"; ) )
);
+ RTL_CONSTASCII_STRINGPARAM( "http://extensions.libreoffice.org/dictionary/"; ) ) );
aMoreDictsLink.SetClickHdl( LINK( this, SvxEditModulesDlg, OpenURLHdl_Impl ) );
}
else
diff --git a/setup_native/source/win32/customactions/relnotes/relnotes.cxx
b/setup_native/source/win32/customactions/relnotes/relnotes.cxx
index d4514a0..e814c12 100644
--- a/setup_native/source/win32/customactions/relnotes/relnotes.cxx
+++ b/setup_native/source/win32/customactions/relnotes/relnotes.cxx
@@ -175,7 +175,7 @@ extern "C" UINT __stdcall ShowSurveyAfter( MSIHANDLE handle )
aExecInf.cbSize = sizeof( aExecInf );
aExecInf.fMask = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI;
aExecInf.lpVerb = TEXT("open");
- aExecInf.lpFile = TEXT("http://surveys.services.openoffice.org/deinstall";);
+ aExecInf.lpFile = TEXT("http://surveys.libreoffice.org/deinstall";);
aExecInf.lpDirectory = NULL;
aExecInf.nShow = SW_SHOWNORMAL;
diff --git a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
index bc55109..c8f5c57 100644
--- a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
@@ -29,7 +29,7 @@
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"; oor:name="ExtensionManager"
oor:package="org.openoffice.Office">
<node oor:name="ExtensionRepositories">
<prop oor:name="WebsiteLink">
- <value>http://extensions.documentfoundation.org/</value>
+ <value>http://extensions.libreoffice.org/</value>
</prop>
</node>
</oor:component-data>
diff --git a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
index 7ff9146..e2d420a 100755
--- a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
@@ -40,7 +40,7 @@
<info>
<desc>the url where additional infomation can be found.</desc>
</info>
-
<value>http://wiki.services.openoffice.org/wiki/User_Experience/OpenOffice.org_User_Feedback_Program</value>
+ <value>http://wiki.documentfoundation.org/UX/LibreOffice_User_Feedback_Program</value>
</prop>
</group>
<group oor:name="Counters">
@@ -74,7 +74,7 @@
<info>
<desc>the url where reports get send to.</desc>
</info>
- <value>http://report.services.openoffice.org:80/soap/servlet/rpcrouter</value>
+ <value>http://report.libreoffice.org:80/soap/servlet/rpcrouter</value>
</prop>
<prop oor:name="SoapIdAdditions" oor:type="xs:string">
<info>
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 4a495f8..1c7b5a5 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -1740,7 +1740,7 @@ void SvtDocumentTemplateDialog::InitImpl( )
if ( !bHideLink )
{
aMoreTemplatesLink.SetURL( String(
- RTL_CONSTASCII_STRINGPARAM( "http://templates.documentfoundation.org/"; ) ) );
+ RTL_CONSTASCII_STRINGPARAM( "http://templates.libreoffice.org/"; ) ) );
aMoreTemplatesLink.SetClickHdl( LINK( this, SvtDocumentTemplateDialog, OpenLinkHdl_Impl ) );
}
else
Attachment:
pgp9BRO4qXaBG.pgp
Description: PGP signature