#88919# using Permission struct; modifying AccessControlException

4 files changed, 34 insertions, 60 deletions

diff --git a/udkapi/com/sun/star/security/AccessControlException.idl b/udkapi/com/sun/star/security/AccessControlException.idl
index 10136bfaab35..e155109538d3 100644
--- a/udkapi/com/sun/star/security/AccessControlException.idl
+++ b/udkapi/com/sun/star/security/AccessControlException.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessControlException.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: dbo $ $Date: 2001-12-11 11:06:55 $
+ *  last change: $Author: dbo $ $Date: 2001-12-11 16:36:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,15 +81,14 @@ module com {  module sun {  module star {  module security {
 */
 exception AccessControlException : com::sun::star::uno::SecurityException
 {
-    /** lacking permission: type
+    /** lacking permission; although this is most often a Permission struct,
+        this is extensible for future permissions keeping compatible.
+        <p>
+        Remember: code calling checkPermission() giving a permission
+        specification most often does not catch a coming AccessControlException!
+        </p>
     */
-    string PermissionType;
-    /** lacking permission: target
-    */
-    string PermissionTarget;
-    /** lacking permission: actions
-    */
-    string PermissionActions;
+    any LackingPermission;
 };
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/security/XAccessControlContext.idl b/udkapi/com/sun/star/security/XAccessControlContext.idl
index dfd17b0359fb..a7add95b96f5 100644
--- a/udkapi/com/sun/star/security/XAccessControlContext.idl
+++ b/udkapi/com/sun/star/security/XAccessControlContext.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XAccessControlContext.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: dbo $ $Date: 2001-12-10 19:16:10 $
+ *  last change: $Author: dbo $ $Date: 2001-12-11 16:36:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,6 +65,10 @@
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
+#ifndef __com_sun_star_security_Permission_idl__
+#include <com/sun/star/security/Permission.idl>
+#endif
+
 #ifndef __com_sun_star_security_AccessControlException_idl__
 #include <com/sun/star/security/AccessControlException.idl>
 #endif
@@ -98,30 +102,14 @@ interface XAccessControlContext : com::sun::star::uno::XInterface
         or throws a suitable AccessControlException otherwise.
         </p>
 
-        @param permissionType
-               type name of permission; pre-defined names are:
-               <ul>
-               <li>java.io.FilePermission</li>
-               <li>java.net.SocketPermission</li>
-               <li>java.util.PropertyPermission</li>
-               <li>java.lang.RuntimePermission</li>
-               <li>java.net.NetPermission</li>
-               <li>java.security.SecurityPermission</li>
-               <li>java.security.AllPermission</li>
-               <li>... more?</li>
-               </ul>
-        @param permissionTarget
-               target of permission, e.g., file name
-        @param permissionActions
-               (list) of actions permitted, e.g., "read,write"
+        @param perm
+               permission to be checked
 
         @throws AccessControlException
                 thrown if access is denied
     */
     void checkPermission(
-        [in] string permissionType,
-        [in] string permissionTarget,
-        [in] string permissionActions )
+        [in] Permission perm )
         raises (AccessControlException);
 };
 
diff --git a/udkapi/com/sun/star/security/XAccessController.idl b/udkapi/com/sun/star/security/XAccessController.idl
index 0ac916eb3d8b..8c63ae1bcfc5 100644
--- a/udkapi/com/sun/star/security/XAccessController.idl
+++ b/udkapi/com/sun/star/security/XAccessController.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XAccessController.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: dbo $ $Date: 2001-12-10 19:16:10 $
+ *  last change: $Author: dbo $ $Date: 2001-12-11 16:36:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,10 @@
 #include <com/sun/star/security/XPrivilegedAction.idl>
 #endif
 
+#ifndef __com_sun_star_security_Permission_idl__
+#include <com/sun/star/security/Permission.idl>
+#endif
+
 #ifndef __com_sun_star_security_AccessControlException_idl__
 #include <com/sun/star/security/AccessControlException.idl>
 #endif
@@ -100,30 +104,14 @@ interface XAccessController : com::sun::star::uno::XInterface
         or throws a suitable AccessControlException otherwise.
         </p>
 
-        @param permissionType
-               type name of permission; pre-defined names are:
-               <ul>
-               <li>java.io.FilePermission</li>
-               <li>java.net.SocketPermission</li>
-               <li>java.util.PropertyPermission</li>
-               <li>java.lang.RuntimePermission</li>
-               <li>java.net.NetPermission</li>
-               <li>java.security.SecurityPermission</li>
-               <li>java.security.AllPermission</li>
-               <li>... more?</li>
-               </ul>
-        @param permissionTarget
-               target of permission, e.g., file name
-        @param permissionActions
-               (list) of actions permitted, e.g., "read,write"
+        @param perm
+               permission to be checked
 
         @throws AccessControlException
                 thrown if access is denied
     */
     void checkPermission(
-        [in] string permissionType,
-        [in] string permissionTarget,
-        [in] string permissionActions )
+        [in] Permission perm )
         raises (AccessControlException);
 
     /** Perform the specified action with privileges enabled and restricted
diff --git a/udkapi/com/sun/star/security/makefile.mk b/udkapi/com/sun/star/security/makefile.mk
index 97a84d452d23..92e425c536a4 100644
--- a/udkapi/com/sun/star/security/makefile.mk
+++ b/udkapi/com/sun/star/security/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: dbo $ $Date: 2001-12-11 10:59:07 $
+#   last change: $Author: dbo $ $Date: 2001-12-11 16:36:36 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -78,14 +78,13 @@ PACKAGE=com$/sun$/star$/security
 # ------------------------------------------------------------------------
 
 IDLFILES= \
-    AccessController.idl \
-    XAccessController.idl \
-    XAccessControlContext.idl \
-    XPrivilegedAction.idl \
+    AccessController.idl			\
+    XAccessController.idl			\
+    XAccessControlContext.idl		\
+    XPrivilegedAction.idl			\
+    Permission.idl				\
     AccessControlException.idl
 
-#	Permission.idl \
-
 # ------------------------------------------------------------------
 
 .INCLUDE :  target.mk