You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2007/01/23 01:09:38 UTC
svn commit: r498863 - in /directory/triplesec/trunk:
store/src/main/java/org/safehaus/triplesec/store/interceptor/ApplicationAciManager.java
webapp-changelog/src/main/webapp/WEB-INF/classes/
Author: akarasulu
Date: Mon Jan 22 16:09:36 2007
New Revision: 498863
URL: http://svn.apache.org/viewvc?view=rev&rev=498863
Log:
fixing rename issues with attributes
Modified:
directory/triplesec/trunk/store/src/main/java/org/safehaus/triplesec/store/interceptor/ApplicationAciManager.java
directory/triplesec/trunk/webapp-changelog/src/main/webapp/WEB-INF/classes/ (props changed)
Modified: directory/triplesec/trunk/store/src/main/java/org/safehaus/triplesec/store/interceptor/ApplicationAciManager.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/store/src/main/java/org/safehaus/triplesec/store/interceptor/ApplicationAciManager.java?view=diff&rev=498863&r1=498862&r2=498863
==============================================================================
--- directory/triplesec/trunk/store/src/main/java/org/safehaus/triplesec/store/interceptor/ApplicationAciManager.java (original)
+++ directory/triplesec/trunk/store/src/main/java/org/safehaus/triplesec/store/interceptor/ApplicationAciManager.java Mon Jan 22 16:09:36 2007
@@ -21,7 +21,7 @@
import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.util.AttributeUtils;
@@ -64,7 +64,7 @@
static
{
- Collection c = new HashSet();
+ Collection<String> c = new HashSet<String>();
c.add( "normalizationService" );
c.add( "authenticationService" );
c.add( "defaultAuthorizationService" );
@@ -74,7 +74,7 @@
ADD_BYPASS = Collections.unmodifiableCollection( c );
DEL_BYPASS = Collections.unmodifiableCollection( c );
- c = new HashSet();
+ c = new HashSet<String>();
c.addAll( PartitionNexusProxy.LOOKUP_BYPASS );
c.add( "policyProtectionService" );
LOOKUP_BYPASS = Collections.unmodifiableCollection( c );
@@ -204,7 +204,7 @@
groupDn.normalize( registry.getNormalizerMapping() );
// create the admin group entry
- Attributes group = new AttributesImpl();
+ Attributes group = new LockableAttributesImpl();
group.put( "objectClass", "top" );
group.get( "objectClass" ).add( "groupOfUniqueNames" );
group.put( cnAttr );
@@ -228,7 +228,7 @@
return;
}
- Attributes groups = new AttributesImpl();
+ Attributes groups = new LockableAttributesImpl();
groups.put( "objectClass", "top" );
groups.get( "objectClass" ).add( "organizationalUnit" );
groups.put( "ou", "Groups" );
@@ -303,7 +303,7 @@
// calculate subentry attributes with both app user ACI and
// app admin group ACI in same subentry
- Attributes subentry = new AttributesImpl();
+ Attributes subentry = new LockableAttributesImpl();
subentry.put( "objectClass", "top" );
subentry.get( "objectClass" ).add( "subentry" );
subentry.get( "objectClass" ).add( "accessControlSubentry" );
@@ -361,7 +361,7 @@
}
}
- Attributes mods = new AttributesImpl();
+ Attributes mods = new LockableAttributesImpl();
mods.put( "administrativeRole", "accessControlSpecificArea" );
proxy.modify( apDn, DirContext.ADD_ATTRIBUTE, mods );
acsaLut.add( apDn.getNormName() );
Propchange: directory/triplesec/trunk/webapp-changelog/src/main/webapp/WEB-INF/classes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 22 16:09:36 2007
@@ -0,0 +1 @@
+org