You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/02/09 19:44:07 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/common XMLUnmarshaller.java
remm 01/02/09 10:44:05
Modified: src/share/org/apache/slide/common XMLUnmarshaller.java
Log:
- Will now correctly unmarshal negative permissions correctly.
Revision Changes Path
1.11 +20 -15 jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java
Index: XMLUnmarshaller.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XMLUnmarshaller.java 2000/12/02 07:32:08 1.10
+++ XMLUnmarshaller.java 2001/02/09 18:44:01 1.11
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java,v 1.10 2000/12/02 07:32:08 remm Exp $
- * $Revision: 1.10 $
- * $Date: 2000/12/02 07:32:08 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java,v 1.11 2001/02/09 18:44:01 remm Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/02/09 18:44:01 $
*
* ====================================================================
*
@@ -77,14 +77,12 @@
import org.apache.slide.authenticate.CredentialsToken;
import org.apache.slide.util.conf.Configuration;
import org.apache.slide.util.conf.ConfigurationException;
-//import org.apache.avalon.Configuration;
-//import org.apache.avalon.ConfigurationException;
/**
* XMLUnmarshaller class.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public final class XMLUnmarshaller {
@@ -198,21 +196,28 @@
String actionUri =
permissionDefinition.getAttribute("action");
- NodePermission permission = null;
+ boolean inheritable = true;
try {
- if (permissionDefinition.getAttribute("inheritance")
+ if (permissionDefinition.getAttribute("inheritable")
.equals("false")) {
- permission = new NodePermission(uri, subjectUri,
- actionUri, false);
- } else {
- permission = new NodePermission(uri, subjectUri,
- actionUri);
+ inheritable = false;
}
} catch (ConfigurationException e) {
- permission = new NodePermission(uri, subjectUri,
- actionUri);
}
+
+ boolean negative = false;
+
+ try {
+ if (permissionDefinition.getAttribute("negative")
+ .equals("true")) {
+ negative = true;
+ }
+ } catch (ConfigurationException e) {
+ }
+
+ NodePermission permission = new NodePermission
+ (uri, subjectUri, actionUri, inheritable, negative);
// Adding the NodePermission to the ObjectNode
accessToken.getSecurityHelper()