[jboss-cvs] Picketlink SVN: r165 - in idm/trunk: assembly and 22 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 4 11:30:27 EST 2010
Author: bdaw
Date: 2010-03-04 11:30:25 -0500 (Thu, 04 Mar 2010)
New Revision: 165
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-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAPICacheProviderImpl.java
idm/trunk/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheIdentityStoreCacheProviderImpl.java
idm/trunk/picketlink-idm-common/pom.xml
idm/trunk/picketlink-idm-core/pom.xml
idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/IdentitySearchCriteriaImpl.java
idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/IdentitySessionImpl.java
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-spi/pom.xml
idm/trunk/picketlink-idm-testsuite/pom.xml
idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml
idm/trunk/pom.xml
Log:
- fix caching issues
- prepare 1.1.0.Beta7
Modified: idm/trunk/assembly/pom.xml
===================================================================
--- idm/trunk/assembly/pom.xml 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/assembly/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
<packaging>pom</packaging>
<name>PicketLink IDM Assembly </name>
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
<relativePath>../parent</relativePath>
</parent>
Modified: idm/trunk/example/auth/pom.xml
===================================================================
--- idm/trunk/example/auth/pom.xml 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/example/auth/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -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.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</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-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/example/auth-simple/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -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.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</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-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/example/simple/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -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.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</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-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/integration/deployer/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -8,12 +8,12 @@
<groupId>org.picketlink.idm.integration</groupId>
<artifactId>picketlink-idm-jboss5-deployer</artifactId>
<packaging>jar</packaging>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-integration</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
</parent>
<properties>
Modified: idm/trunk/integration/jboss5/pom.xml
===================================================================
--- idm/trunk/integration/jboss5/pom.xml 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/integration/jboss5/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -8,12 +8,12 @@
<groupId>org.picketlink.idm.integration</groupId>
<artifactId>picketlink-idm-jboss5</artifactId>
<packaging>jar</packaging>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-integration</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
</parent>
<dependencies>
Modified: idm/trunk/integration/pom.xml
===================================================================
--- idm/trunk/integration/pom.xml 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/integration/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -13,7 +13,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: idm/trunk/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/parent/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -8,7 +8,7 @@
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
<packaging>pom</packaging>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</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-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-api/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</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-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-auth/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</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-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-cache/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAPICacheProviderImpl.java
===================================================================
--- idm/trunk/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAPICacheProviderImpl.java 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAPICacheProviderImpl.java 2010-03-04 16:30:25 UTC (rev 165)
@@ -104,19 +104,24 @@
public static final String NODE_RELATIONSHIP_SEARCHES = "NODE_ROLE_TYPE_SEARCHES";
+ public static final String NULL_NS_NODE = "PL_COMMON_NS";
+
+ public static final String MAIN_ROOT = "NODE_MAIN_ROOT";
+
private Fqn getNamespacedFqn(String ns)
{
- return Fqn.fromElements("NODE_MAIN_ROOT", ns);
+ String namespace = ns != null ? ns : NULL_NS_NODE;
+ return Fqn.fromString("/" + MAIN_ROOT + "/" + namespace);
}
private Fqn getFqn(String ns, String node, Object o)
{
- return Fqn.fromElements(getNamespacedFqn(ns), node, o);
+ return Fqn.fromString(getNamespacedFqn(ns) + "/" + node + "/" + o);
}
private Fqn getFqn(String ns, String node)
{
- return Fqn.fromElements(getNamespacedFqn(ns), node);
+ return Fqn.fromString(getNamespacedFqn(ns) + "/" + node);
}
public void initialize(Map<String, String> properties, IdentityConfigurationRegistry configurationRegistry)
@@ -164,10 +169,12 @@
public void invalidate(String ns)
{
- cache.getRoot().removeChild(getNamespacedFqn(ns));
+
+ boolean success = cache.getRoot().removeChild(getNamespacedFqn(ns));
+
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Invalidating namespace:" + ns);
+ log.finer(this.toString() + "Invalidating namespace:" + ns + "; success=" + success);
}
}
@@ -239,7 +246,7 @@
public void putUsers(String ns, IdentitySearchCriteria criteria, Collection<User> users)
{
- Fqn nodeFqn = getFqn(ns, NODE_USERS_CRITERIA, criteria.hashCode());
+ Fqn nodeFqn = getFqn(ns, NODE_USERS_CRITERIA, criteria != null ? criteria.hashCode() : null);
Node ioNode = getCache().getRoot().addChild(nodeFqn);
@@ -247,14 +254,15 @@
if (log.isLoggable(Level.FINER))
{
+
log.finer(this.toString() + "User criteria search stored in cache: users.size()=" + users.size() +
- "; criteria.hash()=" + criteria.hashCode() + ";namespace=" + ns);
+ "; criteria.hash()=" + criteria + ";namespace=" + ns);
}
}
public Collection<User> getUsers(String ns, IdentitySearchCriteria criteria)
{
- Fqn nodeFqn = getFqn(ns, NODE_USERS_CRITERIA, criteria.hashCode());
+ Fqn nodeFqn = getFqn(ns, NODE_USERS_CRITERIA, criteria != null ? criteria.hashCode() : null);
Node node = getCache().getRoot().getChild(nodeFqn);
@@ -265,7 +273,7 @@
if (log.isLoggable(Level.FINER) && users != null)
{
log.finer(this.toString() + "User criteria search found in cache: users.size()=" + users.size() +
- "; criteria.hash()=" + criteria.hashCode() + ";namespace=" + ns);
+ "; criteria.hash()=" + criteria + ";namespace=" + ns);
}
return users;
@@ -276,11 +284,11 @@
public void invalidateUsers(String ns)
{
- getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns), NODE_USERS));
- getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns), NODE_USERS_COUNT));
- getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns), NODE_USERS_CRITERIA));
- getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns), NODE_USERS_QUERIES));
- getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns), NODE_USERS_SEARCHES));
+ getCache().getRoot().removeChild(Fqn.fromString(getNamespacedFqn(ns) + "/" + NODE_USERS));
+ getCache().getRoot().removeChild(Fqn.fromString(getNamespacedFqn(ns) + "/" + NODE_USERS_COUNT));
+ getCache().getRoot().removeChild(Fqn.fromString(getNamespacedFqn(ns) + "/" + NODE_USERS_CRITERIA));
+ getCache().getRoot().removeChild(Fqn.fromString(getNamespacedFqn(ns) + "/" + NODE_USERS_QUERIES));
+ getCache().getRoot().removeChild(Fqn.fromString(getNamespacedFqn(ns) + "/" + NODE_USERS_SEARCHES));
if (log.isLoggable(Level.FINER))
{
log.finer(this.toString() + "Invalidating Users cache. Namespace:" + ns + ";namespace=" + ns);
@@ -329,7 +337,7 @@
public void invalidateUserCount(String ns)
{
- getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns), NODE_USERS_COUNT));
+ getCache().getRoot().removeChild(Fqn.fromString(getNamespacedFqn(ns) + "/" + NODE_USERS_COUNT));
if (log.isLoggable(Level.FINER))
{
log.finer(this.toString() + "Invalidating User count. Namespace:" + ns + ";namespace=" + ns);
@@ -386,7 +394,7 @@
public void putGroups(String ns, IdentitySearchCriteria criteria, Collection<Group> groups)
{
- Fqn nodeFqn = getFqn(ns, NODE_GROUPS_CRITERIA, criteria.hashCode());
+ Fqn nodeFqn = getFqn(ns, NODE_GROUPS_CRITERIA, criteria != null ? criteria.hashCode() : null);
Node ioNode = getCache().getRoot().addChild(nodeFqn);
@@ -395,13 +403,13 @@
if (log.isLoggable(Level.FINER))
{
log.finer(this.toString() + "Group criteria search stored in cache: groups.size()=" + groups.size() +
- "; criteria.hash()=" + criteria.hashCode() + ";namespace=" + ns);
+ "; criteria.hash()=" + criteria + ";namespace=" + ns);
}
}
public Collection<Group> getGroups(String ns, IdentitySearchCriteria criteria)
{
- Fqn nodeFqn = getFqn(ns, NODE_GROUPS_CRITERIA, criteria.hashCode());
+ Fqn nodeFqn = getFqn(ns, NODE_GROUPS_CRITERIA, criteria != null ? criteria.hashCode() : null);
Node node = getCache().getRoot().getChild(nodeFqn);
@@ -412,7 +420,7 @@
if (log.isLoggable(Level.FINER) && groups != null)
{
log.finer(this.toString() + "Group criteria search found in cache: groups.size()=" + groups.size() +
- "; criteria.hash()=" + criteria.hashCode() + ";namespace=" + ns);
+ "; criteria.hash()=" + criteria + ";namespace=" + ns);
}
return groups;
@@ -423,11 +431,11 @@
public void invalidateGroups(String ns)
{
- getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns), NODE_GROUPS));
- getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns), NODE_GROUPS_COUNT));
- getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns), NODE_GROUPS_CRITERIA));
- getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns), NODE_GROUPS_QUERIES));
- getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns), NODE_GROUPS_SEARCHES));
+ getCache().getRoot().removeChild(Fqn.fromString(getNamespacedFqn(ns) + "/" + NODE_GROUPS));
+ getCache().getRoot().removeChild(Fqn.fromString(getNamespacedFqn(ns) + "/" + NODE_GROUPS_COUNT));
+ getCache().getRoot().removeChild(Fqn.fromString(getNamespacedFqn(ns) + "/" + NODE_GROUPS_CRITERIA));
+ getCache().getRoot().removeChild(Fqn.fromString(getNamespacedFqn(ns) + "/" + NODE_GROUPS_QUERIES));
+ getCache().getRoot().removeChild(Fqn.fromString(getNamespacedFqn(ns) + "/" + NODE_GROUPS_SEARCHES));
if (log.isLoggable(Level.FINER))
{
log.finer(this.toString() + "Invalidating Groups cache. Namespace:" + ns + ";namespace=" + ns);
@@ -716,7 +724,7 @@
public void invalidateRoleTypeProperties(String ns, RoleType roleType)
{
- cache.getRoot().removeChild(getFqn(ns, NODE_ROLE_PROPERTIES, roleType.hashCode()));
+ cache.getRoot().removeChild(getFqn(ns, NODE_ROLE_TYPE_PROPERTIES, roleType.hashCode()));
if (log.isLoggable(Level.FINER))
{
log.finer(this.toString() + "Invalidating RoleType properties. roleType=" + roleType + "; Namespace:" + ns);
@@ -725,7 +733,7 @@
public void invalidateRoleTypeProperties(String ns)
{
- cache.getRoot().removeChild(getFqn(ns, NODE_ROLE_PROPERTIES));
+ cache.getRoot().removeChild(getFqn(ns, NODE_ROLE_TYPE_PROPERTIES));
if (log.isLoggable(Level.FINER))
{
log.finer(this.toString() + "Invalidating RoleType properties. Namespace:" + ns);
Modified: idm/trunk/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheIdentityStoreCacheProviderImpl.java
===================================================================
--- idm/trunk/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheIdentityStoreCacheProviderImpl.java 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheIdentityStoreCacheProviderImpl.java 2010-03-04 16:30:25 UTC (rev 165)
@@ -84,17 +84,17 @@
private Fqn getNamespacedFqn(String ns)
{
- return Fqn.fromElements("NODE_MAIN_ROOT", ns);
+ return Fqn.fromString("/" + "NODE_MAIN_ROOT" + "/" + ns);
}
private Fqn getFqn(String ns, String node, Object o)
{
- return Fqn.fromElements(getNamespacedFqn(ns), node, o);
+ return Fqn.fromString(getNamespacedFqn(ns) + "/" + node + "/" + o);
}
private Fqn getFqn(String ns, String node)
{
- return Fqn.fromElements(getNamespacedFqn(ns), node);
+ return Fqn.fromString(getNamespacedFqn(ns) + "/" + node);
}
public void initialize(Map<String, String> properties, IdentityRepositoryConfigurationContext configurationContext)
@@ -220,7 +220,7 @@
public void invalidateIdentityObjectCount(String ns, String type)
{
- getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns), NODE_IO_COUNT, type));
+ getCache().getRoot().removeChild(Fqn.fromString(getNamespacedFqn(ns) + "/" + NODE_IO_COUNT + "/" + type));
if (log.isLoggable(Level.FINER))
{
log.finer(this.toString() + "Invalidating IdentityObject count. Namespace:" + ns + "; type=" + type
Modified: idm/trunk/picketlink-idm-common/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-common/pom.xml 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-common/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</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-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-core/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/IdentitySearchCriteriaImpl.java
===================================================================
--- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/IdentitySearchCriteriaImpl.java 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/IdentitySearchCriteriaImpl.java 2010-03-04 16:30:25 UTC (rev 165)
@@ -530,4 +530,10 @@
result = 31 * result + (filter != null ? filter.hashCode() : 0);
return result;
}
+
+ @Override
+ public String toString()
+ {
+ return Integer.toString(hashCode());
+ }
}
Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/IdentitySessionImpl.java
===================================================================
--- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/IdentitySessionImpl.java 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/IdentitySessionImpl.java 2010-03-04 16:30:25 UTC (rev 165)
@@ -129,6 +129,8 @@
return invocationCtx;
}
};
+
+ this.apiCacheProvider = apiCacheProvider;
sessionContext = new IdentitySessionContextImpl(repository, typeMapper, resolver);
@@ -140,10 +142,10 @@
this.groupQueryExecutor = new GroupQueryExecutorImpl(this);
this.roleQueryExecutor = new RoleQueryExecutorImpl(this);
- this.apiCacheProvider = apiCacheProvider;
+
if (apiCacheProvider != null)
{
// Find cache scope
Modified: idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: idm/trunk/picketlink-idm-docs/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-docs/pom.xml 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-docs/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
<relativePath>../parent</relativePath>
</parent>
Modified: idm/trunk/picketlink-idm-hibernate/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-hibernate/pom.xml 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-hibernate/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</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-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-ldap/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/picketlink-idm-spi/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-spi/pom.xml 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-spi/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</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-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-testsuite/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml
===================================================================
--- idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -211,7 +211,7 @@
<options>
<option>
<name>cache</name>
- <value>true</value>
+ <value>false</value>
</option>
<option>
<name>cache.providerClass</name>
Modified: idm/trunk/pom.xml
===================================================================
--- idm/trunk/pom.xml 2010-03-03 21:58:31 UTC (rev 164)
+++ idm/trunk/pom.xml 2010-03-04 16:30:25 UTC (rev 165)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.0.Beta7-SNAPSHOT</version>
+ <version>1.1.0.Beta7</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
More information about the jboss-cvs-commits
mailing list