[jboss-cvs] Picketlink SVN: r152 - in idm/trunk: assembly and 19 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 12 16:14:01 EST 2010
Author: bdaw
Date: 2010-02-12 16:13:59 -0500 (Fri, 12 Feb 2010)
New Revision: 152
Modified:
idm/trunk/assembly/pom.xml
idm/trunk/example/auth-simple/pom.xml
idm/trunk/example/auth/pom.xml
idm/trunk/example/simple/pom.xml
idm/trunk/integration/deployer/pom.xml
idm/trunk/integration/jboss5/pom.xml
idm/trunk/integration/pom.xml
idm/trunk/parent/pom.xml
idm/trunk/picketlink-idm-api/pom.xml
idm/trunk/picketlink-idm-auth/pom.xml
idm/trunk/picketlink-idm-cache/pom.xml
idm/trunk/picketlink-idm-common/pom.xml
idm/trunk/picketlink-idm-core/pom.xml
idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml
idm/trunk/picketlink-idm-docs/pom.xml
idm/trunk/picketlink-idm-hibernate/pom.xml
idm/trunk/picketlink-idm-ldap/pom.xml
idm/trunk/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java
idm/trunk/picketlink-idm-spi/pom.xml
idm/trunk/picketlink-idm-testsuite/pom.xml
idm/trunk/pom.xml
Log:
- Small improvement in LDAP IO creation
- Prepare to 1.1.0.Beta5
Modified: idm/trunk/assembly/pom.xml
===================================================================
--- idm/trunk/assembly/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/assembly/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<packaging>pom</packaging>
<name>PicketLink IDM Assembly </name>
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>../parent</relativePath>
</parent>
Modified: idm/trunk/example/auth/pom.xml
===================================================================
--- idm/trunk/example/auth/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/example/auth/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm.example</groupId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<artifactId>example-auth</artifactId>
<packaging>jar</packaging>
<name>Example - JEE authentication</name>
Modified: idm/trunk/example/auth-simple/pom.xml
===================================================================
--- idm/trunk/example/auth-simple/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/example/auth-simple/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm.example</groupId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<artifactId>example-auth-simple</artifactId>
<packaging>jar</packaging>
<name>Example - JEE authentication (using deployer)</name>
Modified: idm/trunk/example/simple/pom.xml
===================================================================
--- idm/trunk/example/simple/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/example/simple/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm.example</groupId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<artifactId>example-simple</artifactId>
<packaging>jar</packaging>
<name>Example - Simple PicketLink IDM Maven2 project</name>
Modified: idm/trunk/integration/deployer/pom.xml
===================================================================
--- idm/trunk/integration/deployer/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/integration/deployer/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -8,12 +8,12 @@
<groupId>org.picketlink.idm.integration</groupId>
<artifactId>picketlink-idm-jboss5-deployer</artifactId>
<packaging>jar</packaging>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-integration</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
</parent>
<properties>
Modified: idm/trunk/integration/jboss5/pom.xml
===================================================================
--- idm/trunk/integration/jboss5/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/integration/jboss5/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -8,12 +8,12 @@
<groupId>org.picketlink.idm.integration</groupId>
<artifactId>picketlink-idm-jboss5</artifactId>
<packaging>jar</packaging>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-integration</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
</parent>
<dependencies>
Modified: idm/trunk/integration/pom.xml
===================================================================
--- idm/trunk/integration/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/integration/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -13,7 +13,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: idm/trunk/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/parent/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -8,7 +8,7 @@
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
<packaging>pom</packaging>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<name>PicketLink IDM- Parent</name>
<url>http://labs.jboss.org/portal/jbosssecurity/</url>
<description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description>
Modified: idm/trunk/picketlink-idm-api/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-api/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/picketlink-idm-api/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/picketlink-idm-auth/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-auth/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/picketlink-idm-auth/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/picketlink-idm-cache/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-cache/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/picketlink-idm-cache/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/picketlink-idm-common/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-common/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/picketlink-idm-common/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/picketlink-idm-core/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-core/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/picketlink-idm-core/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: idm/trunk/picketlink-idm-docs/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-docs/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/picketlink-idm-docs/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>../parent</relativePath>
</parent>
Modified: idm/trunk/picketlink-idm-hibernate/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-hibernate/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/picketlink-idm-hibernate/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/picketlink-idm-ldap/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-ldap/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/picketlink-idm-ldap/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java
===================================================================
--- idm/trunk/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2010-02-12 21:13:59 UTC (rev 152)
@@ -29,6 +29,7 @@
import org.picketlink.idm.impl.model.ldap.LDAPIdentityObjectImpl;
import org.picketlink.idm.impl.model.ldap.LDAPIdentityObjectRelationshipImpl;
import org.picketlink.idm.impl.store.FeaturesMetaDataImpl;
+import org.picketlink.idm.impl.types.SimpleIdentityObject;
import org.picketlink.idm.spi.configuration.IdentityStoreConfigurationContext;
import org.picketlink.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData;
import org.picketlink.idm.spi.configuration.metadata.IdentityObjectTypeMetaData;
@@ -252,6 +253,8 @@
LdapContext ldapContext = getLDAPContext(invocationCtx);
+ String dn = null;
+
try
{
// If there are many contexts specified in the configuration the first one is used
@@ -312,7 +315,11 @@
LdapName validLDAPName = new LdapName(getTypeConfiguration(invocationCtx, type).getIdAttributeName().concat("=").concat(name));
log.finer("creating ldap entry for: " + validLDAPName + "; " + attrs);
- ctx.createSubcontext(validLDAPName, attrs);
+ DirContext entry = ctx.createSubcontext(validLDAPName, attrs);
+ if (entry != null)
+ {
+ dn = entry.getNameInNamespace();
+ }
}
catch (Exception e)
{
@@ -330,7 +337,7 @@
}
}
- return findIdentityObject(invocationCtx, name, type);
+ return new SimpleIdentityObject(name, dn, type);
}
@@ -571,7 +578,7 @@
for (IdentityObjectType match : matches)
{
LDAPIdentityObjectImpl entry = (LDAPIdentityObjectImpl)this.findIdentityObject(ctx, name, match);
- if (entry.getDn().equalsIgnoreCase(dn))
+ if (entry != null && entry.getDn().equalsIgnoreCase(dn))
{
type = match;
break;
Modified: idm/trunk/picketlink-idm-spi/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-spi/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/picketlink-idm-spi/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/picketlink-idm-testsuite/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-testsuite/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/picketlink-idm-testsuite/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/pom.xml
===================================================================
--- idm/trunk/pom.xml 2010-02-12 07:26:11 UTC (rev 151)
+++ idm/trunk/pom.xml 2010-02-12 21:13:59 UTC (rev 152)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta4</version>
+ <version>1.1.0.Beta5</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
More information about the jboss-cvs-commits
mailing list