[jboss-identity-commits] JBoss Identity SVN: r233 - in idm/trunk: idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate and 10 other directories.
jboss-identity-commits at lists.jboss.org
jboss-identity-commits at lists.jboss.org
Tue Jan 20 11:53:59 EST 2009
Author: anil.saldhana at jboss.com
Date: 2009-01-20 11:53:59 -0500 (Tue, 20 Jan 2009)
New Revision: 233
Modified:
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Attribute.java
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManagerFeaturesDescription.java
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManagerFeaturesDescription.java
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManagerFeaturesDescription.java
idm/trunk/idm-common/src/main/java/org/jboss/identity/idm/exception/FeatureNotSupportedException.java
idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/exception/IdentityConfigurationException.java
idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/exception/OperationNotSupportedException.java
idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/model/IdentityObjectAttribute.java
idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/FeaturesMetaData.java
idm/trunk/idm/.classpath
idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java
idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectTextAttribute.java
idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/FallbackIdentityStoreRepository.java
idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/FeaturesMetaDataImpl.java
idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java
idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java
idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/types/SimpleIdentityObjectType.java
Log:
minor
Modified: idm/trunk/idm/.classpath
===================================================================
--- idm/trunk/idm/.classpath 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm/.classpath 2009-01-20 16:53:59 UTC (rev 233)
@@ -12,5 +12,6 @@
<classpathentry kind="var" path="M2_REPO/sun-opends/OpenDS/1.0.0/OpenDS-1.0.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.ga/hibernate-3.2.4.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
<classpathentry kind="output" path="target/eclipse-classes"/>
</classpath>
Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java
===================================================================
--- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectAttribute.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -98,6 +98,7 @@
this.name = name;
}
+ @SuppressWarnings("unchecked")
public void addValue(String val)
{
getValues().add(val);
Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectTextAttribute.java
===================================================================
--- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectTextAttribute.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectTextAttribute.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -22,16 +22,15 @@
package org.jboss.identity.idm.impl.model.hibernate;
-import org.hibernate.annotations.CollectionOfElements;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.Table;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Arrays;
-import java.util.Collections;
+import org.hibernate.annotations.CollectionOfElements;
+
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
@@ -56,8 +55,7 @@
public HibernateIdentityObjectTextAttribute(HibernateIdentityObject identityObject, String name, String[] values)
{
- super(identityObject, name);
- List<String> list = Arrays.asList(values);
+ super(identityObject, name);
}
public Set<String> getValues()
Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/FallbackIdentityStoreRepository.java
===================================================================
--- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/FallbackIdentityStoreRepository.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/FallbackIdentityStoreRepository.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -77,6 +77,7 @@
private final String id;
//TODO: rewrite this to other config object?
+ @SuppressWarnings("unused")
private IdentityRepositoryConfigurationMetaData configurationMD;
public static final String ALLOW_NOT_DEFINED_ATTRIBUTES = "allowNotDefinedAttributes";
@@ -150,7 +151,7 @@
return resolveIdentityStore(identityObjectType).getSupportedFeatures().isControlSupported(identityObjectType, control);
}
- public boolean isControlSupported(IdentityObjectType identityObjectType, Class controlClazz)
+ public boolean isControlSupported(IdentityObjectType identityObjectType, Class<?> controlClazz)
{
return resolveIdentityStore(identityObjectType).getSupportedFeatures().isControlSupported(identityObjectType, controlClazz);
}
@@ -242,7 +243,7 @@
defaultIdentityStore.getSupportedFeatures().isRoleNameControlSupported(control);
}
- public boolean isRoleNameControlSupported(Class controlClazz)
+ public boolean isRoleNameControlSupported(Class<?> controlClazz)
{
// If there is any IdentityStore that supports named relationships...
for (IdentityStore identityStore : getIdentityStoreMappings().values())
@@ -623,9 +624,7 @@
}
public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, boolean named, String name) throws IdentityException
- {
- IdentityStore store = resolveIdentityStore(identity);
-
+ {
Set<IdentityObjectRelationship> relationships = new HashSet<IdentityObjectRelationship>();
// For any IdentityStore that supports named relationships...
Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/FeaturesMetaDataImpl.java
===================================================================
--- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/FeaturesMetaDataImpl.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/FeaturesMetaDataImpl.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -22,23 +22,22 @@
package org.jboss.identity.idm.impl.store;
-import org.jboss.identity.idm.spi.store.FeaturesMetaData;
-import org.jboss.identity.idm.spi.model.IdentityObjectType;
-import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType;
-import org.jboss.identity.idm.spi.model.IdentityObjectCredentialType;
-import org.jboss.identity.idm.spi.searchcontrol.IdentityObjectSearchControl;
-import org.jboss.identity.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData;
-import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectTypeMetaData;
-import org.jboss.identity.idm.spi.configuration.metadata.RelationshipMetaData;
-import org.jboss.identity.idm.exception.IdentityException;
-
-import java.util.Set;
-import java.util.Map;
-import java.util.List;
-import java.util.HashSet;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import org.jboss.identity.idm.exception.IdentityException;
+import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectTypeMetaData;
+import org.jboss.identity.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData;
+import org.jboss.identity.idm.spi.configuration.metadata.RelationshipMetaData;
+import org.jboss.identity.idm.spi.model.IdentityObjectCredentialType;
+import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType;
+import org.jboss.identity.idm.spi.model.IdentityObjectType;
+import org.jboss.identity.idm.spi.searchcontrol.IdentityObjectSearchControl;
+import org.jboss.identity.idm.spi.store.FeaturesMetaData;
+
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
@@ -47,7 +46,7 @@
{
private Set<String> supportedTypeNames = new HashSet<String>();
- private final Set<Class> supportedSearchControls;
+ private final Set<Class<?>> supportedSearchControls;
private final Map<String, Set<String>> supportedCredentials;
@@ -60,7 +59,7 @@
public FeaturesMetaDataImpl(IdentityStoreConfigurationMetaData configurationMD,
- Set<Class> supportedControls,
+ Set<Class<?>> supportedControls,
boolean namedRelationshipsSupport,
Set<String> readOnlyObjectTypes)
{
@@ -92,8 +91,6 @@
// Supported relationships
- List<String> relationshipNames = configurationMD.getSupportedRelationshipTypes();
-
for (IdentityObjectTypeMetaData identityObjectTypeMetaData : configurationMD.getSupportedIdentityTypes())
{
String fromTypeName = identityObjectTypeMetaData.getName();
@@ -174,7 +171,7 @@
return false;
}
- public boolean isControlSupported(IdentityObjectType identityObjectType, Class controlClazz)
+ public boolean isControlSupported(IdentityObjectType identityObjectType, Class<?> controlClazz)
{
if (supportedSearchControls.contains(controlClazz))
{
@@ -231,7 +228,7 @@
return isNamedRelationshipsSupported() && isControlSupported(null, control);
}
- public boolean isRoleNameControlSupported(Class controlClazz)
+ public boolean isRoleNameControlSupported(Class<?> controlClazz)
{
// For now simple - use the same allowed controls list for everything
return isNamedRelationshipsSupported() && isControlSupported(null, controlClazz);
Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java
===================================================================
--- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -22,59 +22,60 @@
package org.jboss.identity.idm.impl.store.hibernate;
-import org.jboss.identity.idm.spi.store.IdentityStore;
-import org.jboss.identity.idm.spi.store.FeaturesMetaData;
-import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext;
-import org.jboss.identity.idm.spi.store.IdentityStoreSession;
-import org.jboss.identity.idm.spi.searchcontrol.IdentityObjectSearchControl;
-import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType;
-import org.jboss.identity.idm.spi.model.IdentityObject;
-import org.jboss.identity.idm.spi.model.IdentityObjectType;
-import org.jboss.identity.idm.spi.model.IdentityObjectRelationship;
-import org.jboss.identity.idm.spi.model.IdentityObjectCredential;
-import org.jboss.identity.idm.spi.exception.OperationNotSupportedException;
-import org.jboss.identity.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData;
-import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectTypeMetaData;
-import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData;
-import org.jboss.identity.idm.spi.model.IdentityObjectCredentialType;
-import org.jboss.identity.idm.spi.model.IdentityObjectAttribute;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.persistence.NoResultException;
+import javax.persistence.Persistence;
+import javax.persistence.Query;
+
+import org.hibernate.Criteria;
+import org.hibernate.HibernateException;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.ejb.HibernateEntityManager;
+import org.hibernate.ejb.HibernateEntityManagerFactory;
import org.jboss.identity.idm.exception.IdentityException;
+import org.jboss.identity.idm.impl.api.AttributeFilterSearchControl;
+import org.jboss.identity.idm.impl.api.NameFilterSearchControl;
+import org.jboss.identity.idm.impl.api.PageSearchControl;
+import org.jboss.identity.idm.impl.api.SortByNameSearchControl;
import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject;
+import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute;
+import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute;
+import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential;
+import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType;
import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship;
+import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName;
import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType;
+import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute;
import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName;
import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute;
-import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute;
-import org.jboss.identity.idm.impl.api.PageSearchControl;
-import org.jboss.identity.idm.impl.api.SortByNameSearchControl;
-import org.jboss.identity.idm.impl.api.AttributeFilterSearchControl;
-import org.jboss.identity.idm.impl.api.NameFilterSearchControl;
import org.jboss.identity.idm.impl.store.FeaturesMetaDataImpl;
-import org.hibernate.ejb.HibernateEntityManager;
-import org.hibernate.ejb.HibernateEntityManagerFactory;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.HibernateException;
-import org.hibernate.Criteria;
+import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData;
+import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectTypeMetaData;
+import org.jboss.identity.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData;
+import org.jboss.identity.idm.spi.exception.OperationNotSupportedException;
+import org.jboss.identity.idm.spi.model.IdentityObject;
+import org.jboss.identity.idm.spi.model.IdentityObjectAttribute;
+import org.jboss.identity.idm.spi.model.IdentityObjectCredential;
+import org.jboss.identity.idm.spi.model.IdentityObjectCredentialType;
+import org.jboss.identity.idm.spi.model.IdentityObjectRelationship;
+import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType;
+import org.jboss.identity.idm.spi.model.IdentityObjectType;
+import org.jboss.identity.idm.spi.searchcontrol.IdentityObjectSearchControl;
+import org.jboss.identity.idm.spi.store.FeaturesMetaData;
+import org.jboss.identity.idm.spi.store.IdentityStore;
+import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext;
+import org.jboss.identity.idm.spi.store.IdentityStoreSession;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
-import javax.persistence.Persistence;
-import java.util.Set;
-import java.util.Collection;
-import java.util.Map;
-import java.util.List;
-import java.util.Iterator;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Collections;
-
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
@@ -130,7 +131,7 @@
// TODO: rewrite this into some more handy object
private IdentityStoreConfigurationMetaData configurationMD;
- private static Set<Class> supportedIdentityObjectSearchControls = new HashSet<Class>();
+ private static Set<Class<?>> supportedIdentityObjectSearchControls = new HashSet<Class<?>>();
private static Set<String> supportedCredentialTypes = new HashSet<String>();
@@ -363,7 +364,7 @@
HibernateRealm realm = getRealm(em, ctx);
// Check if object with a given name and type is not present already
- List results = em.createNamedQuery("findIdentityObjectByNameAndType")
+ List<?> results = em.createNamedQuery("findIdentityObjectByNameAndType")
.setParameter("realm", realm)
.setParameter("name", name)
.setParameter("typeName", identityObjectType.getName())
@@ -515,6 +516,7 @@
+ @SuppressWarnings("unchecked")
public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext ctx,
IdentityObjectType identityType,
IdentityObjectSearchControl[] controls) throws IdentityException
@@ -626,6 +628,7 @@
}
+ @SuppressWarnings("unchecked")
public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, IdentityObjectSearchControl[] controls) throws IdentityException
{
//TODO:test
Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java
===================================================================
--- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -22,66 +22,67 @@
package org.jboss.identity.idm.impl.store.ldap;
-import org.jboss.identity.idm.spi.store.IdentityStore;
-import org.jboss.identity.idm.spi.store.FeaturesMetaData;
-import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext;
-import org.jboss.identity.idm.spi.store.IdentityStoreSession;
-import org.jboss.identity.idm.spi.searchcontrol.IdentityObjectSearchControl;
-import org.jboss.identity.idm.spi.model.IdentityObject;
-import org.jboss.identity.idm.spi.model.IdentityObjectType;
-import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType;
-import org.jboss.identity.idm.spi.model.IdentityObjectRelationship;
-import org.jboss.identity.idm.spi.model.IdentityObjectCredential;
-import org.jboss.identity.idm.spi.model.IdentityObjectAttribute;
-import org.jboss.identity.idm.spi.exception.OperationNotSupportedException;
-import org.jboss.identity.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData;
-import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectTypeMetaData;
-import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Pattern;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.naming.ldap.Control;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapContext;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.SortControl;
+
import org.jboss.identity.idm.exception.IdentityException;
-import org.jboss.identity.idm.impl.store.FeaturesMetaDataImpl;
-import org.jboss.identity.idm.impl.model.ldap.LDAPIdentityObjectImpl;
-import org.jboss.identity.idm.impl.model.ldap.LDAPIdentityObjectRelationshipImpl;
-import org.jboss.identity.idm.impl.helper.Tools;
import org.jboss.identity.idm.impl.NotYetImplementedException;
-import org.jboss.identity.idm.impl.api.SortByNameSearchControl;
-import org.jboss.identity.idm.impl.api.PageSearchControl;
import org.jboss.identity.idm.impl.api.AttributeFilterSearchControl;
import org.jboss.identity.idm.impl.api.NameFilterSearchControl;
+import org.jboss.identity.idm.impl.api.PageSearchControl;
import org.jboss.identity.idm.impl.api.SimpleAttribute;
+import org.jboss.identity.idm.impl.api.SortByNameSearchControl;
+import org.jboss.identity.idm.impl.helper.Tools;
+import org.jboss.identity.idm.impl.model.ldap.LDAPIdentityObjectImpl;
+import org.jboss.identity.idm.impl.model.ldap.LDAPIdentityObjectRelationshipImpl;
+import org.jboss.identity.idm.impl.store.FeaturesMetaDataImpl;
+import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData;
+import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectTypeMetaData;
+import org.jboss.identity.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData;
+import org.jboss.identity.idm.spi.exception.OperationNotSupportedException;
+import org.jboss.identity.idm.spi.model.IdentityObject;
+import org.jboss.identity.idm.spi.model.IdentityObjectAttribute;
+import org.jboss.identity.idm.spi.model.IdentityObjectCredential;
+import org.jboss.identity.idm.spi.model.IdentityObjectRelationship;
+import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType;
+import org.jboss.identity.idm.spi.model.IdentityObjectType;
+import org.jboss.identity.idm.spi.searchcontrol.IdentityObjectSearchControl;
+import org.jboss.identity.idm.spi.store.FeaturesMetaData;
+import org.jboss.identity.idm.spi.store.IdentityStore;
+import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext;
+import org.jboss.identity.idm.spi.store.IdentityStoreSession;
-import javax.naming.ldap.LdapContext;
-import javax.naming.ldap.LdapName;
-import javax.naming.ldap.Control;
-import javax.naming.ldap.SortControl;
-import javax.naming.ldap.InitialLdapContext;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.BasicAttributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.SearchResult;
-import javax.naming.directory.DirContext;
-import javax.naming.NamingException;
-import javax.naming.NamingEnumeration;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.Comparator;
-import java.util.regex.Pattern;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
@@ -103,7 +104,7 @@
IdentityStoreConfigurationMetaData configurationMD;
- private static Set<Class> supportedSearchControls = new HashSet<Class>();
+ private static Set<Class<?>> supportedSearchControls = new HashSet<Class<?>>();
// <IdentityObjectType name, <Attribute name, MD>
private Map<String, Map<String, IdentityObjectAttributeMetaData>> attributesMetaData = new HashMap<String, Map<String, IdentityObjectAttributeMetaData>>();
Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/types/SimpleIdentityObjectType.java
===================================================================
--- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/types/SimpleIdentityObjectType.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/types/SimpleIdentityObjectType.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -33,8 +33,7 @@
private String name;
private SimpleIdentityObjectType()
- {
-
+ {
}
public SimpleIdentityObjectType(String name)
Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Attribute.java
===================================================================
--- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Attribute.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Attribute.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -51,7 +51,7 @@
/**
* @return attribute values
*/
- Collection getValues();
+ Collection<?> getValues();
/**
* @return number of attribute values
Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManagerFeaturesDescription.java
===================================================================
--- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManagerFeaturesDescription.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManagerFeaturesDescription.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -59,7 +59,7 @@
* @param controlClazz
* @return
*/
- boolean isIdentitiesSearchControlSupported(Class controlClazz);
+ boolean isIdentitiesSearchControlSupported(Class<?> controlClazz);
/**
* Check if control can be used in Group search methods
@@ -77,7 +77,5 @@
* @param controlClazz
* @return
*/
- boolean isGroupsSearchControlSupported(GroupType groupType, Class controlClazz);
-
-
-}
+ boolean isGroupsSearchControlSupported(GroupType groupType, Class<?> controlClazz);
+}
\ No newline at end of file
Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManagerFeaturesDescription.java
===================================================================
--- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManagerFeaturesDescription.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManagerFeaturesDescription.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -60,7 +60,7 @@
* @param controlClazz
* @return
*/
- boolean isIdentitiesSearchControlSupported(Class controlClazz);
+ boolean isIdentitiesSearchControlSupported(Class<?> controlClazz);
/**
* Check if control can be used in Group search methods
@@ -78,7 +78,5 @@
* @param controlClazz
* @return
*/
- boolean isGroupsSearchControlSupported(GroupType groupType, Class controlClazz);
-
-
-}
+ boolean isGroupsSearchControlSupported(GroupType groupType, Class<?> controlClazz);
+}
\ No newline at end of file
Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManagerFeaturesDescription.java
===================================================================
--- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManagerFeaturesDescription.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManagerFeaturesDescription.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -40,11 +40,11 @@
* @param controlClazz
* @return
*/
- boolean isRoleTypeSearchControlSupported(Class controlClazz);
+ boolean isRoleTypeSearchControlSupported(Class<?> controlClazz);
/**
* @param control
* @return
*/
boolean isRoleTypeSearchControlSupported(IdentitySearchControl control);
-}
+}
\ No newline at end of file
Modified: idm/trunk/idm-common/src/main/java/org/jboss/identity/idm/exception/FeatureNotSupportedException.java
===================================================================
--- idm/trunk/idm-common/src/main/java/org/jboss/identity/idm/exception/FeatureNotSupportedException.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm-common/src/main/java/org/jboss/identity/idm/exception/FeatureNotSupportedException.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -23,11 +23,14 @@
package org.jboss.identity.idm.exception;
/**
+ * Exception indicating that the feature is not implemented
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
*/
public class FeatureNotSupportedException extends Exception
{
+ private static final long serialVersionUID = -1460754797949133004L;
+
public FeatureNotSupportedException()
{
super();
Modified: idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/exception/IdentityConfigurationException.java
===================================================================
--- idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/exception/IdentityConfigurationException.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/exception/IdentityConfigurationException.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -25,11 +25,14 @@
import org.jboss.identity.idm.exception.IdentityException;
/**
+ * Exception indicating some issue in configuration
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
*/
public class IdentityConfigurationException extends IdentityException
{
+ private static final long serialVersionUID = 1L;
+
public IdentityConfigurationException()
{
super();
@@ -49,4 +52,4 @@
{
super(cause);
}
-}
+}
\ No newline at end of file
Modified: idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/exception/OperationNotSupportedException.java
===================================================================
--- idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/exception/OperationNotSupportedException.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/exception/OperationNotSupportedException.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -23,11 +23,14 @@
package org.jboss.identity.idm.spi.exception;
/**
+ * Identity operation not supported exception
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
*/
public class OperationNotSupportedException extends Exception
{
+ private static final long serialVersionUID = 1L;
+
public OperationNotSupportedException(String message)
{
super(message);
@@ -42,4 +45,4 @@
{
super(cause);
}
-}
+}
\ No newline at end of file
Modified: idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/model/IdentityObjectAttribute.java
===================================================================
--- idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/model/IdentityObjectAttribute.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/model/IdentityObjectAttribute.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -31,8 +31,7 @@
* @since Jun 30, 2008
*/
public interface IdentityObjectAttribute
-{
-
+{
/**
* @return name
*/
@@ -53,11 +52,11 @@
/**
* @return attribute values
*/
+ @SuppressWarnings("unchecked")
Collection getValues();
/**
* @return number of attribute values
*/
- int getSize();
-
+ int getSize();
}
\ No newline at end of file
Modified: idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/FeaturesMetaData.java
===================================================================
--- idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/FeaturesMetaData.java 2009-01-19 06:06:06 UTC (rev 232)
+++ idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/FeaturesMetaData.java 2009-01-20 16:53:59 UTC (rev 233)
@@ -37,8 +37,7 @@
* @since Jul 10, 2008
*/
public interface FeaturesMetaData
-{
-
+{
/**
* Check if IdentityObjects with a given IdentityObjectType can be created and removed
*
@@ -69,7 +68,7 @@
* @param controlClazz
* @return
*/
- boolean isControlSupported(IdentityObjectType identityObjectType, Class controlClazz);
+ boolean isControlSupported(IdentityObjectType identityObjectType, Class<?> controlClazz);
/**
*
@@ -83,7 +82,7 @@
* @param controlClazz
* @return
*/
- boolean isRoleNameControlSupported(Class controlClazz);
+ boolean isRoleNameControlSupported(Class<?> controlClazz);
/**
* @return set of identity types that can be persisted
More information about the jboss-identity-commits
mailing list