portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r694069 - in /portals/jetspeed-2/portal/branches/security-refactoring: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ jetspeed-api/src/main/java/org/apache/jetspeed/security/
Date Thu, 11 Sep 2008 00:00:00 GMT
Author: ate
Date: Wed Sep 10 17:00:00 2008
New Revision: 694069

URL: http://svn.apache.org/viewvc?rev=694069&view=rev
Log:
Moving build-in SecurityAttributeType categories from SecurityAttributes to SecurityAttributeType
Also renaming (not yet used) internal category PORTAL_CATEGORY to JETSPEED_CATEGORY

Modified:
    portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/SecurityAttributeTypeImpl.java
    portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/SecurityAttributesImpl.java
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityAttributeType.java
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityAttributes.java

Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/SecurityAttributeTypeImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/SecurityAttributeTypeImpl.java?rev=694069&r1=694068&r2=694069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/SecurityAttributeTypeImpl.java
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/SecurityAttributeTypeImpl.java
Wed Sep 10 17:00:00 2008
@@ -18,7 +18,6 @@
 package org.apache.jetspeed.security.impl;
 
 import org.apache.jetspeed.security.SecurityAttributeType;
-import org.apache.jetspeed.security.SecurityAttributes;
 
 /**
  * @version $Id$
@@ -36,7 +35,7 @@
     public SecurityAttributeTypeImpl(String name)
     {
         this.name = name;
-        this.category = SecurityAttributes.INFO_CATEGORY;
+        this.category = SecurityAttributeType.INFO_CATEGORY;
         this.dataType = SecurityAttributeType.DataType.STRING;
         this.readOnly = false;
         this.required = false;

Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/SecurityAttributesImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/SecurityAttributesImpl.java?rev=694069&r1=694068&r2=694069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/SecurityAttributesImpl.java
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/SecurityAttributesImpl.java
Wed Sep 10 17:00:00 2008
@@ -152,7 +152,7 @@
     
     public Map<String, SecurityAttribute> getInfoAttributeMap()
     {
-        return getAttributeMap(INFO_CATEGORY);
+        return getAttributeMap(SecurityAttributeType.INFO_CATEGORY);
     }
     
     public Map<String, String> getInfoMap()
@@ -160,7 +160,7 @@
         HashMap<String, String> map = new HashMap<String,String>(saMap.size());
         for (SecurityAttribute sa : saMap.values())
         {
-            if (sa.getCategory().equals(INFO_CATEGORY))
+            if (sa.getCategory().equals(SecurityAttributeType.INFO_CATEGORY))
             {
                 map.put(sa.getName(), sa.getStringValue());
             }

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityAttributeType.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityAttributeType.java?rev=694069&r1=694068&r2=694069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityAttributeType.java
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityAttributeType.java
Wed Sep 10 17:00:00 2008
@@ -21,7 +21,19 @@
  */
 public interface SecurityAttributeType
 {
-    enum DataType { STRING };
+    /** 
+     * build-in supported SecurityAttributeType category "info"
+     * This category is also used for custom/extended attributes which are not pre-defined
+     */
+    String INFO_CATEGORY = "info";
+    
+    /** 
+     * build-in supported SecurityAttributeType category "jetspeed"
+     * This category is used for jetspeed internal attributes
+     */
+    String JETSPEED_CATEGORY = "jetspeed";
+
+    enum DataType { STRING }
 
     String getName();
 

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityAttributes.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityAttributes.java?rev=694069&r1=694068&r2=694069&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityAttributes.java
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityAttributes.java
Wed Sep 10 17:00:00 2008
@@ -24,8 +24,6 @@
  */
 public interface SecurityAttributes
 {
-    String INFO_CATEGORY = "info";
-    String PORTAL_CATEGORY = "portal";
     JetspeedPrincipal getPrincipal();
 
     int size();



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message