#88919# slight modifications omitting Permission

5 files changed, 69 insertions, 44 deletions

diff --git a/udkapi/com/sun/star/security/AccessControlException.idl b/udkapi/com/sun/star/security/AccessControlException.idl
index b07d73730925..c7c5d4c8db07 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.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dbo $ $Date: 2001-02-15 13:44:54 $
+ *  last change: $Author: dbo $ $Date: 2001-12-10 19:16:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,13 +76,12 @@ module com {  module sun {  module star {  module security {
 
 //=============================================================================
 
-/** <p><b>WARNING: this is just a draft and may be changed!</b></p>
-    Exception notifying a lacking permission to access data or execute code
+/** Exception notifying a lacking permission to access data or execute code
     thus it is thrown if permission ought to be denied.
 */
 exception AccessControlException : com::sun::star::uno::SecurityException
 {
-    /** denied permission
+    /** lacking permission
     */
     Permission LackingPermission;
 };
diff --git a/udkapi/com/sun/star/security/AccessController.idl b/udkapi/com/sun/star/security/AccessController.idl
index 4065a41a85da..b81c9def4244 100644
--- a/udkapi/com/sun/star/security/AccessController.idl
+++ b/udkapi/com/sun/star/security/AccessController.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessController.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dbo $ $Date: 2001-02-15 13:44:54 $
+ *  last change: $Author: dbo $ $Date: 2001-12-10 19:16:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,9 +72,8 @@ module com {  module sun {  module star {  module security {
 
 //=============================================================================
 
-/** <p><b>WARNING: this is just a draft and may be changed!</b></p>
-    This service supports the XAccessController interface for checking security
-    permissions along with the current threads' permissions.
+/** This service supports the XAccessController interface for checking security
+    permissions.
     <p>
     It obviously has also to be ensured that the object is process-local to assure
     that permission checks are not corrupted via insecure inter-process
diff --git a/udkapi/com/sun/star/security/XAccessControlContext.idl b/udkapi/com/sun/star/security/XAccessControlContext.idl
index 4a0059e00c59..dfd17b0359fb 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.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:41 $
+ *  last change: $Author: dbo $ $Date: 2001-12-10 19:16:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,10 +65,6 @@
 #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
@@ -80,8 +76,7 @@ module com {  module sun {  module star {  module security {
 
 //=============================================================================
 
-/** <p><b>WARNING: this is just a draft and may be changed!</b></p>
-    An XAccessControlContext is used to make system resource access decisions
+/** An XAccessControlContext is used to make system resource access decisions
     based on the context it encapsulates.
     <p>
     More specifically, it encapsulates a context and has methods to check
@@ -96,17 +91,37 @@ interface XAccessControlContext : com::sun::star::uno::XInterface
 {
     /** Determines whether the access request indicated by the specified
         permission should be allowed or denied, based on this context.
+        The type names and semantics are equivalent to the security permission
+        classes of the Java platform.
         <p>
         This method quietly returns if the access request is permitted,
         or throws a suitable AccessControlException otherwise.
         </p>
-        @param perm
-               access permission to be checked
+
+        @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"
+
         @throws AccessControlException
                 thrown if access is denied
     */
     void checkPermission(
-        [in] Permission perm )
+        [in] string permissionType,
+        [in] string permissionTarget,
+        [in] string permissionActions )
         raises (AccessControlException);
 };
 
diff --git a/udkapi/com/sun/star/security/XAccessController.idl b/udkapi/com/sun/star/security/XAccessController.idl
index 00f4f852a392..0ac916eb3d8b 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.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mi $ $Date: 2001-11-20 10:13:06 $
+ *  last change: $Author: dbo $ $Date: 2001-12-10 19:16:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,10 +73,6 @@
 #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
@@ -88,12 +84,8 @@ module com {  module sun {  module star {  module security {
 
 //=============================================================================
 
-/** <p><b>WARNING: this is just a draft and may be changed!</b></p>
-    Interface for checking permissions and invoking privileged code.
-    <p>
-    A privileged call runs at least in the protection domain of the callers
-    code, although you can give an additional AccessControlContext to restrict
-    access.
+/** Interface for checking permissions and invoking privileged restricted
+    by an additional XAccessControlContext.
     </p>
 */
 interface XAccessController : com::sun::star::uno::XInterface
@@ -101,27 +93,46 @@ interface XAccessController : com::sun::star::uno::XInterface
     /** Determines whether the access request indicated by the specified
         permission should be allowed or denied, based on the security policy
         currently in effect.
+        The type names and semantics are equivalent to the security permission
+        classes of the Java platform.
         <p>
         This method quietly returns if the access request is permitted,
         or throws a suitable AccessControlException otherwise.
         </p>
-        @param perm
-               access permission to be checked
+
+        @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"
+
         @throws AccessControlException
                 thrown if access is denied
     */
     void checkPermission(
-        [in] Permission perm )
+        [in] string permissionType,
+        [in] string permissionTarget,
+        [in] string permissionActions )
         raises (AccessControlException);
 
     /** Perform the specified action with privileges enabled and restricted
         by the specified AccessControlContext.
         <p>
-        The action is performed with the intersection of the the permissions
-        possessed by the caller's protection domain, and those possessed by
-        the domains represented by the specified AccessControlContext.
-        If specified XAccessControlContext is null, then the action is performed
-        only with the permissions possessed by the caller's protection domain.
+        The action is performed with the intersection of the permissions
+        possessed by the caller, and those specified by the XAccessControlContext.
+        If the specified XAccessControlContext is null, then the action is performed
+        only with the permissions possessed by the caller.
         </p>
         @param action
                action object to be executed
diff --git a/udkapi/com/sun/star/security/makefile.mk b/udkapi/com/sun/star/security/makefile.mk
index 4c871b6e4e9e..b4e4c1842a94 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.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: dbo $ $Date: 2000-12-13 14:21:55 $
+#   last change: $Author: dbo $ $Date: 2001-12-10 19:16:10 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -82,9 +82,10 @@ IDLFILES= \
     XAccessController.idl \
     XAccessControlContext.idl \
     XPrivilegedAction.idl \
-    Permission.idl \
     AccessControlException.idl
 
+#	Permission.idl \
+
 # ------------------------------------------------------------------
 
 .INCLUDE :  target.mk