offapi/UnoApi_offapi.mk | 11 +++---- offapi/com/sun/star/auth/SSOExceptions.idl | 33 ---------------------- offapi/com/sun/star/auth/SSOManagerFactory.idl | 11 ++----- offapi/com/sun/star/auth/SSOPasswordCache.idl | 11 ++----- offapi/com/sun/star/auth/XSSOAcceptorContext.idl | 5 ++- offapi/com/sun/star/auth/XSSOInitiatorContext.idl | 5 ++- offapi/com/sun/star/auth/XSSOManager.idl | 4 ++ offapi/com/sun/star/auth/XSSOPasswordCache.idl | 3 +- offapi/type_reference/typelibrary_history.txt | 2 - offapi/type_reference/types.rdb |binary offapi/type_reference/update-rdb.sh | 32 +++++++++++++++++++++ 11 files changed, 59 insertions(+), 58 deletions(-)
New commits: commit 629dd9dae17b902b53839842929fcff4b836b47a Author: Stephan Bergmann <[email protected]> Date: Tue Aug 14 14:40:39 2012 +0200 Remove SSOExceptions.idl Change-Id: I930603bfcee8084eae0a086d3ce02182b8b13541 diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 152358c..8322f90 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -299,9 +299,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessi Accessible \ AccessibleContext \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/auth,\ - SSOExceptions \ -)) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\ AccessibleButton \ AccessibleCheckBox \ diff --git a/offapi/com/sun/star/auth/SSOExceptions.idl b/offapi/com/sun/star/auth/SSOExceptions.idl deleted file mode 100644 index 097a7c8..0000000 --- a/offapi/com/sun/star/auth/SSOExceptions.idl +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef __com_sun_star_auth_SSOExceptions_idl__ -#define __com_sun_star_auth_SSOExceptions_idl__ - -#include <com/sun/star/auth/AuthenticationFailedException.idl> -#include <com/sun/star/auth/InvalidArgumentException.idl> -#include <com/sun/star/auth/InvalidContextException.idl> -#include <com/sun/star/auth/InvalidCredentialException.idl> -#include <com/sun/star/auth/InvalidPrincipalException.idl> -#include <com/sun/star/auth/PersistenceFailureException.idl> -#include <com/sun/star/auth/UnsupportedException.idl> - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/auth/XSSOAcceptorContext.idl b/offapi/com/sun/star/auth/XSSOAcceptorContext.idl index af9de07..d8eb2c2 100644 --- a/offapi/com/sun/star/auth/XSSOAcceptorContext.idl +++ b/offapi/com/sun/star/auth/XSSOAcceptorContext.idl @@ -29,8 +29,11 @@ #ifndef __com_sun_star_auth_XSSOAcceptorContext_idl__ #define __com_sun_star_auth_XSSOAcceptorContext_idl__ +#include <com/sun/star/auth/AuthenticationFailedException.idl> +#include <com/sun/star/auth/InvalidArgumentException.idl> +#include <com/sun/star/auth/InvalidContextException.idl> +#include <com/sun/star/auth/InvalidCredentialException.idl> #include <com/sun/star/auth/XSSOContext.idl> -#include <com/sun/star/auth/SSOExceptions.idl> module com { module sun { module star { module auth { diff --git a/offapi/com/sun/star/auth/XSSOInitiatorContext.idl b/offapi/com/sun/star/auth/XSSOInitiatorContext.idl index 7b4408b..a1b69a3 100644 --- a/offapi/com/sun/star/auth/XSSOInitiatorContext.idl +++ b/offapi/com/sun/star/auth/XSSOInitiatorContext.idl @@ -29,8 +29,11 @@ #ifndef __com_sun_star_auth_XSSOInitiatorContext_idl__ #define __com_sun_star_auth_XSSOInitiatorContext_idl__ +#include <com/sun/star/auth/AuthenticationFailedException.idl> +#include <com/sun/star/auth/InvalidArgumentException.idl> +#include <com/sun/star/auth/InvalidContextException.idl> +#include <com/sun/star/auth/InvalidCredentialException.idl> #include <com/sun/star/auth/XSSOContext.idl> -#include <com/sun/star/auth/SSOExceptions.idl> module com { module sun { module star { module auth { diff --git a/offapi/com/sun/star/auth/XSSOManager.idl b/offapi/com/sun/star/auth/XSSOManager.idl index acb2eb2..0a68a32 100644 --- a/offapi/com/sun/star/auth/XSSOManager.idl +++ b/offapi/com/sun/star/auth/XSSOManager.idl @@ -31,7 +31,9 @@ #include <com/sun/star/uno/XInterface.idl> #include <com/sun/star/auth/InvalidArgumentException.idl> -#include <com/sun/star/auth/SSOExceptions.idl> +#include <com/sun/star/auth/InvalidCredentialException.idl> +#include <com/sun/star/auth/InvalidPrincipalException.idl> +#include <com/sun/star/auth/UnsupportedException.idl> #include <com/sun/star/auth/XSSOAcceptorContext.idl> #include <com/sun/star/auth/XSSOInitiatorContext.idl> diff --git a/offapi/com/sun/star/auth/XSSOPasswordCache.idl b/offapi/com/sun/star/auth/XSSOPasswordCache.idl index 2e434d9..23aac25 100644 --- a/offapi/com/sun/star/auth/XSSOPasswordCache.idl +++ b/offapi/com/sun/star/auth/XSSOPasswordCache.idl @@ -20,8 +20,9 @@ #ifndef __com_sun_star_auth_XSSOPasswordCache_idl__ #define __com_sun_star_auth_XSSOPasswordCache_idl__ +#include <com/sun/star/auth/InvalidArgumentException.idl> +#include <com/sun/star/auth/PersistenceFailureException.idl> #include <com/sun/star/uno/XInterface.idl> -#include <com/sun/star/auth/SSOExceptions.idl> module com { module sun { module star { module auth { commit 213938438a22e44d591a708505b4a9389275a12e Author: Jean-Tiare LE BIGOT <[email protected]> Date: Fri Aug 10 00:00:54 2012 -0400 Applied fdo#46808 to offapi/auth module For auth module, this is more like a cosmetic change :) Anyway, all the tests passes and this is one more module migrated. Signed-off-by: Stephan Bergmann <[email protected]> with additional changes: * Kept the odd SSOExceptions as noheader instead of nohdl. Change-Id: Iaef3b4ab8c29526be8d0a388fc17e6af5d293c81 diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 0242a25..152358c 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -42,6 +42,10 @@ $(eval $(call gb_UnoApi_set_include,offapi,\ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\ TargetPropertiesCreator \ )) +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/auth,\ + SSOManagerFactory \ + SSOPasswordCache \ +)) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\ AsyncCallback \ ContainerWindowProvider \ @@ -297,8 +301,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessi )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/auth,\ SSOExceptions \ - SSOManagerFactory \ - SSOPasswordCache \ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\ AccessibleButton \ diff --git a/offapi/com/sun/star/auth/SSOManagerFactory.idl b/offapi/com/sun/star/auth/SSOManagerFactory.idl index 88f212a..c874f7e 100644 --- a/offapi/com/sun/star/auth/SSOManagerFactory.idl +++ b/offapi/com/sun/star/auth/SSOManagerFactory.idl @@ -58,16 +58,13 @@ module com { module sun { module star { module auth { send to the initiator side.</LI> </UL> + The interface supports the creation of <type>XSSOManager</type> instances + which can subsequently be used to create security contexts. + @since OOo 1.1.2 */ -published service SSOManagerFactory -{ - /** supports the creation of <type>XSSOManager</type> instances which can - subsequently be used to create security contexts. - */ - interface XSSOManagerFactory; -}; +published service SSOManagerFactory: XSSOManagerFactory; }; }; }; }; diff --git a/offapi/com/sun/star/auth/SSOPasswordCache.idl b/offapi/com/sun/star/auth/SSOPasswordCache.idl index 04aa837..7bf03cb 100644 --- a/offapi/com/sun/star/auth/SSOPasswordCache.idl +++ b/offapi/com/sun/star/auth/SSOPasswordCache.idl @@ -28,15 +28,12 @@ module com { module sun { module star { module auth { implementations which don't provide some sort of authentication information repository. + provides access to a cache which maps usernames to associated passwords. + Individual cache entries may be persisted. + @since OOo 1.1.2 */ -published service SSOPasswordCache -{ - /** provides access to a cache which maps usernames to associated passwords. - Individual cache entries may be persisted. - */ - interface XSSOPasswordCache; -}; +published service SSOPasswordCache: XSSOPasswordCache; }; }; }; }; diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb index be001df..ed7e61a 100644 Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ commit a334c468508125b9a8342b285f81561d8ad026e1 Author: Jean-Tiare LE BIGOT <[email protected]> Date: Tue Aug 7 22:23:38 2012 -0400 Tool to ease rdb file update to work on fdo#46808 Add a simple shell script to ease the regeneration of types.rdb. This is a bit tricky to do and error prone. I hope it will encourage people to work on fdo#46808. Signed-off-by: Stephan Bergmann <[email protected]> with additional changes: * Moved offapi/update-rdb.sh to offapi/type_reference/update-rdb.sh, to make clear that it is all about offapi/type_reference only. * Changed update-rdb.sh to take a list of idl files, so that a single instance of the script works for both offapi and udkapi. * Some more simplifications/clean up of update-rdb.sh. * Removed the udkapi/update-rdb.sh symlink (to avoid potential problems with symlinks checked into the git repo, like on Windows). * Undid accidental(?) changes to typelibrary_history.txt, added a note about update-rdb.sh. Change-Id: Ic1923e2b2b3af64251019b619b33c728a05b4a14 diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt index 0f7c616..2fab53b 100644 --- a/offapi/type_reference/typelibrary_history.txt +++ b/offapi/type_reference/typelibrary_history.txt @@ -1,5 +1,5 @@ Example of updating an incompatibly-changed type (com.sun.star.script.Converter, -in this example) in the accompanying types.rdb: +in this example) in the accompanying types.rdb (see also update-rdb.sh): .../core> mkdir tmp .../core> LD_LIBRARY_PATH=.../core/solver/unxlngx6/lib \ diff --git a/offapi/type_reference/update-rdb.sh b/offapi/type_reference/update-rdb.sh new file mode 100755 index 0000000..18ddc21 --- /dev/null +++ b/offapi/type_reference/update-rdb.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# Basic argument checks +if [ $# -lt 1 ] +then + echo "usage:" + echo " $0 <idl file list>" + echo "" + echo "example:" + echo " $0 \\" + echo " offapi/com/sun/star/auth/SSOManagerFactory.idl \\" + echo " offapi/com/sun/star/auth/SSOPasswordCache.idl" + exit 1 +fi + +# Load env vars +source "$(dirname "$0")"/../../config_host.mk 2>/dev/null + +set -e +mkdir tmp +for i in "$@"; do + "${OUTDIR_FOR_BUILD?}"/bin/regmerge tmp/out1.rdb /UCR \ + "${WORKDIR_FOR_BUILD?}"/UnoApiPartTarget/"${i%.idl}".urd +done +"${OUTDIR_FOR_BUILD?}"/bin/regmerge tmp/out2.rdb / \ + "${SRC_ROOT?}"/offapi/type_reference/types.rdb tmp/out1.rdb +echo "sanity check diff:" +diff <("${OUTDIR_FOR_BUILD?}"/bin/regview \ + "${SRC_ROOT?}"/offapi/type_reference/types.rdb) \ + <("${OUTDIR_FOR_BUILD?}"/bin/regview tmp/out2.rdb) && $? -le 1 +mv tmp/out2.rdb "${SRC_ROOT?}"/offapi/type_reference/types.rdb +rm -r tmp _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
