September 2011 - picketlink-commits

Picketlink SVN: r1222 - federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-09-14 16:10:47 -0400 (Wed, 14 Sep 2011) New Revision: 1222 Added: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/ClassLoadingSecurityActions.java Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java Log: PLFED-229: PicketLink Authenticator has issues due to custom username that does not change Added: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/ClassLoadingSecurityActions.java =================================================================== --- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/ClassLoadingSecurityActions.java (rev 0) +++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/ClassLoadingSecurityActions.java 2011-09-14 20:10:47 UTC (rev 1222) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.bindings.tomcat; + +import java.security.AccessController; +import java.security.PrivilegedAction; + +/** + * Privileged Blocks for loading classes + * Redundant class added to some environment + * with PL1 and PL2 versions of code base + * @author Anil.Saldhana(a)redhat.com + * @since Sep 14, 2011 + */ +class ClassLoadingSecurityActions +{ + static Class<?> loadClass(final Class<?> theClass, final String fqn) + { + return AccessController.doPrivileged(new PrivilegedAction<Class<?>>() + { + public Class<?> run() + { + ClassLoader classLoader = theClass.getClassLoader(); + + Class<?> clazz = loadClass(classLoader, fqn); + if (clazz == null) + { + classLoader = Thread.currentThread().getContextClassLoader(); + clazz = loadClass(classLoader, fqn); + } + return clazz; + } + }); + } + + static Class<?> loadClass(final ClassLoader cl, final String fqn) + { + return AccessController.doPrivileged(new PrivilegedAction<Class<?>>() + { + public Class<?> run() + { + try + { + return cl.loadClass(fqn); + } + catch (ClassNotFoundException e) + { + } + return null; + } + }); + } +} \ No newline at end of file Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java =================================================================== --- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java 2011-09-13 22:52:14 UTC (rev 1221) +++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java 2011-09-14 20:10:47 UTC (rev 1222) @@ -156,7 +156,7 @@ { if (subjectInteraction == null) { - Class<?> clazz = SecurityActions.loadClass(getClass(), subjectInteractionClassName); + Class<?> clazz = ClassLoadingSecurityActions.loadClass(getClass(), subjectInteractionClassName); try { subjectInteraction = (SubjectSecurityInteraction) clazz.newInstance();

12 years, 7 months

1
0
0 / 0

Picketlink SVN: r1221 - in integration-tests/trunk: parent and 10 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-09-13 18:52:14 -0400 (Tue, 13 Sep 2011) New Revision: 1221 Added: integration-tests/trunk/picketlink-int-webapps/authenticator/ integration-tests/trunk/picketlink-int-webapps/authenticator/pom.xml integration-tests/trunk/picketlink-int-webapps/authenticator/src/ integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/ integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/ integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/WEB-INF/ integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/WEB-INF/context.xml integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/WEB-INF/jboss-web.xml integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/WEB-INF/web.xml integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/index.jsp integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/loginmodules/ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/loginmodules/TestRequestUserLoginModule.java integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/PicketLinkAuthenticatorTestCase.java Modified: integration-tests/trunk/ant-scripts/ant-build.xml integration-tests/trunk/parent/pom.xml integration-tests/trunk/picketlink-int-webapps/pom.xml integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml Log: PLFED-229: test for PicketLinkAuthenticator Modified: integration-tests/trunk/ant-scripts/ant-build.xml =================================================================== --- integration-tests/trunk/ant-scripts/ant-build.xml 2011-09-13 20:10:47 UTC (rev 1220) +++ integration-tests/trunk/ant-scripts/ant-build.xml 2011-09-13 22:52:14 UTC (rev 1221) @@ -94,6 +94,7 @@ </antcall> <copy file="${basedir}/../common-dist/files/jboss-log4j.xml" todir="${JBAS5_DEPLOY}/../conf"/> <copy file="${basedir}/../picketlink-int-webapps/claims/target/claims.war" todir="${JBAS5_DEPLOY}/picketlink/"/> + <copy file="${basedir}/../picketlink-int-webapps/authenticator/target/authenticator.war" todir="${JBAS5_DEPLOY}/picketlink/"/> </target> @@ -103,6 +104,7 @@ <param name="jbossas" value="${basedir}/target/jboss-6.0.0.Final"/> </antcall> <copy file="${basedir}/../picketlink-int-webapps/claims/target/claims.war" todir="${JBAS6_DEPLOY}/picketlink/"/> + <copy file="${basedir}/../picketlink-int-webapps/authenticator/target/authenticator.war" todir="${JBAS6_DEPLOY}/picketlink/"/> </target> <target name="copy-sts-props-jbas5"> Modified: integration-tests/trunk/parent/pom.xml =================================================================== --- integration-tests/trunk/parent/pom.xml 2011-09-13 20:10:47 UTC (rev 1220) +++ integration-tests/trunk/parent/pom.xml 2011-09-13 22:52:14 UTC (rev 1221) @@ -29,7 +29,7 @@ <properties>  - <pl-version>2.0.0.final</pl-version> + <pl-version>2.0.1-SNAPSHOT</pl-version>  <pl-trust-version>2.0.0.final</pl-trust-version> </properties> Added: integration-tests/trunk/picketlink-int-webapps/authenticator/pom.xml =================================================================== --- integration-tests/trunk/picketlink-int-webapps/authenticator/pom.xml (rev 0) +++ integration-tests/trunk/picketlink-int-webapps/authenticator/pom.xml 2011-09-13 22:52:14 UTC (rev 1221) @@ -0,0 +1,38 @@ +<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"> + <parent> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-integration-tests-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../../parent</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>authenticator</artifactId> + <packaging>war</packaging> + <name>Authenticator web app</name> + <url>http://labs.jboss.org/portal/picketlink/</url> + <description>PicketLink Samples contains the samples for Federated Identity Needs.</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <warName>authenticator</warName> + <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> + </configuration> + </plugin> + </plugins> + </build> +</project> Property changes on: integration-tests/trunk/picketlink-int-webapps/authenticator/pom.xml ___________________________________________________________________ Added: svn:executable + * Added: integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/WEB-INF/context.xml =================================================================== --- integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/WEB-INF/context.xml (rev 0) +++ integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/WEB-INF/context.xml 2011-09-13 22:52:14 UTC (rev 1221) @@ -0,0 +1,3 @@ +<Context> + <Valve className="org.picketlink.identity.federation.bindings.tomcat.PicketLinkAuthenticator" /> +</Context> Added: integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/WEB-INF/jboss-web.xml (rev 0) +++ integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/WEB-INF/jboss-web.xml 2011-09-13 22:52:14 UTC (rev 1221) @@ -0,0 +1,3 @@ +<jboss-web> +<security-domain>authenticator</security-domain> +</jboss-web> Added: integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/WEB-INF/web.xml =================================================================== --- integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/WEB-INF/web.xml (rev 0) +++ integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/WEB-INF/web.xml 2011-09-13 22:52:14 UTC (rev 1221) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<web-app xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + version="2.5"> + + <security-constraint> + <web-resource-collection> + <web-resource-name>Restricted Access - Get Only</web-resource-name> + <url-pattern>/*</url-pattern> + <http-method>GET</http-method> + </web-resource-collection> + <auth-constraint> + <role-name>STSClient</role-name> + </auth-constraint> + <user-data-constraint> + <transport-guarantee>NONE</transport-guarantee> + </user-data-constraint> + </security-constraint> + + <security-role> + <role-name>STSClient</role-name> + </security-role> +</web-app> Added: integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/index.jsp =================================================================== --- integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/index.jsp (rev 0) +++ integration-tests/trunk/picketlink-int-webapps/authenticator/src/main/webapp/index.jsp 2011-09-13 22:52:14 UTC (rev 1221) @@ -0,0 +1,9 @@ +<%@ page import="java.util.*,java.security.*" %> + +<% +Principal principal = request.getUserPrincipal(); +String name=null; +if(principal != null) + name = principal.getName(); +out.write(name); +%> Modified: integration-tests/trunk/picketlink-int-webapps/pom.xml =================================================================== --- integration-tests/trunk/picketlink-int-webapps/pom.xml 2011-09-13 20:10:47 UTC (rev 1220) +++ integration-tests/trunk/picketlink-int-webapps/pom.xml 2011-09-13 22:52:14 UTC (rev 1221) @@ -23,6 +23,7 @@ <url>http://www.jboss.org</url> </organization> <modules> + <module>authenticator</module> <module>claims</module> </modules> </project> Added: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/loginmodules/TestRequestUserLoginModule.java =================================================================== --- integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/loginmodules/TestRequestUserLoginModule.java (rev 0) +++ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/loginmodules/TestRequestUserLoginModule.java 2011-09-13 22:52:14 UTC (rev 1221) @@ -0,0 +1,67 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.test.trust.loginmodules; + +import javax.security.auth.login.LoginException; +import javax.security.jacc.PolicyContext; +import javax.security.jacc.PolicyContextException; +import javax.servlet.http.HttpServletRequest; + +import org.jboss.security.auth.spi.UsersRolesLoginModule; + +/** + * A test login module that just looks for a request param + * "user" + * @author Anil.Saldhana(a)redhat.com + * @since Sep 13, 2011 + */ +public class TestRequestUserLoginModule extends UsersRolesLoginModule +{ + @Override + protected String[] getUsernameAndPassword() throws LoginException + { + //get the username from the request + /** The JACC PolicyContext key for the current Subject */ + String WEB_REQUEST_KEY = "javax.servlet.http.HttpServletRequest"; + try + { + String password = null; + HttpServletRequest request = (HttpServletRequest) PolicyContext.getContext(WEB_REQUEST_KEY); + String username = request.getParameter("user"); + if(username != null && "UserA".equals(username)) + { + password = "PassA"; + } + else if(username != null && "UserB".equals(username)) + { + password = "PassB"; + } + return new String[] { username, password}; + } + catch (PolicyContextException e) + { + LoginException le = new LoginException(); + le.initCause(e); + throw le; + } + } +} \ No newline at end of file Added: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/PicketLinkAuthenticatorTestCase.java =================================================================== --- integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/PicketLinkAuthenticatorTestCase.java (rev 0) +++ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/PicketLinkAuthenticatorTestCase.java 2011-09-13 22:52:14 UTC (rev 1221) @@ -0,0 +1,56 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.test.trust.tests; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; +import org.picketlink.identity.federation.bindings.tomcat.PicketLinkAuthenticator; + +import com.meterware.httpunit.GetMethodWebRequest; +import com.meterware.httpunit.WebConversation; +import com.meterware.httpunit.WebRequest; +import com.meterware.httpunit.WebResponse; + +/** + * Test the {@link PicketLinkAuthenticator} + * @author Anil.Saldhana(a)redhat.com + * @since Sep 13, 2011 + */ +public class PicketLinkAuthenticatorTestCase +{ + @Test + public void testDistinctUsers() throws Exception + { + WebRequest serviceRequest1 = new GetMethodWebRequest( "http://localhost:8080/authenticator/?user=UserA" ); + WebConversation webConversation = new WebConversation(); + WebResponse webResponse = webConversation.getResponse( serviceRequest1 ); + String responseText = webResponse.getText(); + assertTrue(responseText.contains("UserA")); + + WebRequest serviceRequest2 = new GetMethodWebRequest( "http://localhost:8080/authenticator/?user=UserB" ); + WebConversation webConversation2 = new WebConversation(); + WebResponse webResponse2 = webConversation2.getResponse( serviceRequest2 ); + String responseText2 = webResponse2.getText(); + assertTrue(responseText2.contains("UserB")); + } +} \ No newline at end of file Modified: integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml =================================================================== --- integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml 2011-09-13 20:10:47 UTC (rev 1220) +++ integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml 2011-09-13 22:52:14 UTC (rev 1221) @@ -43,7 +43,6 @@ </authentication> </application-policy> -  <application-policy xmlns="urn:jboss:security-beans:1.0" name="jmx-console"> <authentication> <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"> @@ -53,7 +52,17 @@ </authentication> </application-policy> + <application-policy xmlns="urn:jboss:security-beans:1.0" name="authenticator"> + <authentication> + <login-module code="org.picketlink.test.trust.loginmodules.TestRequestUserLoginModule" flag="required"> + <module-option name="usersProperties">sts-users.properties</module-option> + <module-option name="rolesProperties">sts-roles.properties</module-option> + <module-option name="password-stacking">useFirstPass</module-option> + </login-module> + </authentication> + </application-policy> + <bean name="PicketLinkTestSystemProperties" class="org.jboss.varia.property.SystemPropertiesService"> <property name="properties">

12 years, 7 months

1
0
0 / 0

Picketlink SVN: r1220 - in federation/trunk: picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/subject and 1 other directory.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-09-13 16:10:47 -0400 (Tue, 13 Sep 2011) New Revision: 1220 Added: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/subject/PicketLinkJBossSubjectInteraction.java federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/SubjectSecurityInteraction.java Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java Log: PLFED-229: PicketLink Authenticator has issues due to custom username that does not change Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java =================================================================== --- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java 2011-09-13 04:14:10 UTC (rev 1219) +++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java 2011-09-13 20:10:47 UTC (rev 1220) @@ -23,9 +23,17 @@ import java.io.IOException; import java.security.Principal; +import java.util.Set; +import java.util.UUID; +import javax.security.auth.Subject; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.catalina.Realm; -import org.apache.catalina.authenticator.AuthenticatorBase; +import org.apache.catalina.Session; +import org.apache.catalina.authenticator.Constants; +import org.apache.catalina.authenticator.FormAuthenticator; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.deploy.LoginConfig; @@ -40,27 +48,29 @@ * @author Anil.Saldhana(a)redhat.com * @since Apr 11, 2011 */ -public class PicketLinkAuthenticator extends AuthenticatorBase +public class PicketLinkAuthenticator extends FormAuthenticator { protected static Logger log = Logger.getLogger(PicketLinkAuthenticator.class); protected boolean trace = log.isTraceEnabled(); /** - * The {@link Realm} requires an user name + * This is the auth method used in the register method */ - protected String userName = "custom-authenticator-user"; + protected String authMethod = "SECURITY_DOMAIN"; /** - * The {@link Realm} requires a password + * The authenticator may not be aware of the user name until after + * the underlying security exercise is complete. The Subject + * will have the proper user name. Hence we may need to perform + * an additional authentication now with the user name we have obtained. */ - protected String password = "custom-authenticator-password"; + protected boolean needSubjectPrincipalSubstitution = true; - /** - * This is the auth method used in the register method - */ - protected String authMethod = "SECURITY_DOMAIN"; + protected SubjectSecurityInteraction subjectInteraction = null; + protected String subjectInteractionClassName = "org.picketlink.identity.federation.bindings.jboss.subject.PicketLinkJBossSubjectInteraction"; + public PicketLinkAuthenticator() { if (trace) @@ -70,44 +80,102 @@ } /** - * Set the user name via WEB-INF/context.xml (JBoss AS) - * @param defaultUserName + * Set the auth method via WEB-INF/context.xml (JBoss AS) + * @param authMethod */ - public void setUserName(String defaultUserName) + public void setAuthMethod(String authMethod) { - this.userName = defaultUserName; + this.authMethod = authMethod; } - /** - * Set the password via WEB-INF/context.xml (JBoss AS) - * @param defaultPassword - */ - public void setPassword(String defaultPassword) + public void setNeedSubjectPrincipalSubstitution(String needSubjectPrincipalSubstitutionVal) { - this.password = defaultPassword; + this.needSubjectPrincipalSubstitution = Boolean.valueOf(needSubjectPrincipalSubstitutionVal); } /** - * Set the auth method via WEB-INF/context.xml (JBoss AS) - * @param authMethod + * Set this if you want to override the default {@link SubjectSecurityInteraction} + * @param subjectRetrieverClassName */ - public void setAuthMethod(String authMethod) + public void setSubjectInteractionClassName(String subjectRetrieverClassName) { - this.authMethod = authMethod; + this.subjectInteractionClassName = subjectRetrieverClassName; } @Override - protected boolean authenticate(Request request, Response response, LoginConfig loginConfig) throws IOException + public boolean authenticate(Request request, Response response, LoginConfig loginConfig) throws IOException { + log.trace("Authenticating user"); + + Principal principal = request.getUserPrincipal(); + if (principal != null) + { + if (trace) + log.trace("Already authenticated '" + principal.getName() + "'"); + return true; + } + + Session session = request.getSessionInternal(true); + String userName = UUID.randomUUID().toString(); + String password = userName; Realm realm = context.getRealm(); - Principal principal = realm.authenticate(this.userName, this.password); + principal = realm.authenticate(userName, password); + Principal originalPrincipal = principal; if (principal != null) { - register(request, response, principal, this.authMethod, null, null); + if (needSubjectPrincipalSubstitution) + { + principal = getSubjectPrincipal(); + if (principal == null) + throw new RuntimeException("Principal from subject is null"); + principal = realm.authenticate(principal.getName(), password); + } + session.setNote(Constants.SESS_USERNAME_NOTE, principal.getName()); + session.setNote(Constants.SESS_PASSWORD_NOTE, password); + request.setUserPrincipal(principal); + register(request, response, principal, this.authMethod, principal.getName(), password); + if (originalPrincipal != null && needSubjectPrincipalSubstitution) + { + subjectInteraction.cleanup(originalPrincipal); + } + return true; } - return true; + return false; } + + public boolean authenticate(HttpServletRequest request, HttpServletResponse response, LoginConfig loginConfig) + throws IOException + { + return authenticate((Request) request, (Response) response, loginConfig); + } + + protected Principal getSubjectPrincipal() + { + if (subjectInteraction == null) + { + Class<?> clazz = SecurityActions.loadClass(getClass(), subjectInteractionClassName); + try + { + subjectInteraction = (SubjectSecurityInteraction) clazz.newInstance(); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + + Subject subject = subjectInteraction.get(); + if (subject != null) + { + Set<Principal> principals = subject.getPrincipals(); + if (!principals.isEmpty()) + { + return subject.getPrincipals().iterator().next(); + } + } + return null; + } } \ No newline at end of file Added: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/SubjectSecurityInteraction.java =================================================================== --- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/SubjectSecurityInteraction.java (rev 0) +++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/SubjectSecurityInteraction.java 2011-09-13 20:10:47 UTC (rev 1220) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.bindings.tomcat; + +import java.security.Principal; + +import javax.security.auth.Subject; + +/** + * Interface to retrieve a subject + * @author Anil.Saldhana(a)redhat.com + * @since Sep 13, 2011 + */ +public interface SubjectSecurityInteraction +{ + /** + * Obtain a subject based on implementation + * @return + */ + Subject get(); + + /** + * Clean up the {@link Principal} from + * the security cache + * @param principal + * @return + */ + boolean cleanup(Principal principal); +} \ No newline at end of file Added: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/subject/PicketLinkJBossSubjectInteraction.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/subject/PicketLinkJBossSubjectInteraction.java (rev 0) +++ federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/subject/PicketLinkJBossSubjectInteraction.java 2011-09-13 20:10:47 UTC (rev 1220) @@ -0,0 +1,106 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.bindings.jboss.subject; + +import java.security.Principal; +import java.util.Calendar; + +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.security.auth.Subject; +import javax.security.jacc.PolicyContext; +import javax.security.jacc.PolicyContextException; + +import org.jboss.logging.Logger; +import org.jboss.security.SimplePrincipal; +import org.jboss.security.SubjectSecurityManager; +import org.picketlink.identity.federation.bindings.tomcat.SubjectSecurityInteraction; +import org.picketlink.identity.federation.core.factories.JBossAuthCacheInvalidationFactory; +import org.picketlink.identity.federation.core.factories.JBossAuthCacheInvalidationFactory.TimeCacheExpiry; + +/** + * An implementation of {@link SubjectSecurityInteraction} for JBoss AS + * @author Anil.Saldhana(a)redhat.com + * @since Sep 13, 2011 + */ +public class PicketLinkJBossSubjectInteraction implements SubjectSecurityInteraction +{ + protected static Logger log = Logger.getLogger(PicketLinkJBossSubjectInteraction.class); + + protected boolean trace = log.isTraceEnabled(); + + /** + * @see org.picketlink.identity.federation.bindings.tomcat.SubjectSecurityInteraction#cleanup(java.security.Principal) + */ + public boolean cleanup(Principal principal) + { + try + { + String securityDomain = getSecurityDomain(); + if (trace) + { + log.trace("Determined Security Domain=" + securityDomain); + } + TimeCacheExpiry cacheExpiry = JBossAuthCacheInvalidationFactory.getCacheExpiry(); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.SECOND, 10);//Add 25 seconds + if (trace) + { + log.trace("Will expire from cache in 10 seconds, principal=" + principal); + } + cacheExpiry.register(securityDomain, calendar.getTime(), principal); + //Additional expiry of simple principal + cacheExpiry.register(securityDomain, calendar.getTime(), new SimplePrincipal(principal.getName())); + } + catch (NamingException e) + { + throw new RuntimeException(e); + } + + return false; + } + + /** + * @see org.picketlink.identity.federation.bindings.tomcat.SubjectSecurityInteraction#get() + */ + public Subject get() + { + try + { + return (Subject) PolicyContext.getContext("javax.security.auth.Subject.container"); + } + catch (PolicyContextException e) + { + throw new RuntimeException(e); + } + } + + private String getSecurityDomain() throws NamingException + { + //Get the SecurityManagerService from JNDI + InitialContext ctx = new InitialContext(); + SubjectSecurityManager ssm = (SubjectSecurityManager) ctx.lookup("java:comp/env/security/securityMgr"); + if (ssm == null) + throw new RuntimeException("Unable to get the subject security manager"); + return ssm.getSecurityDomain(); + } +} \ No newline at end of file

12 years, 7 months

1
0
0 / 0

Picketlink SVN: r1219 - social/trunk/facebook/src/main/java/org/picketlink/social/facebook.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-09-13 00:14:10 -0400 (Tue, 13 Sep 2011) New Revision: 1219 Modified: social/trunk/facebook/src/main/java/org/picketlink/social/facebook/FacebookAuthenticator.java Log: add the additional method Modified: social/trunk/facebook/src/main/java/org/picketlink/social/facebook/FacebookAuthenticator.java =================================================================== --- social/trunk/facebook/src/main/java/org/picketlink/social/facebook/FacebookAuthenticator.java 2011-09-13 03:38:43 UTC (rev 1218) +++ social/trunk/facebook/src/main/java/org/picketlink/social/facebook/FacebookAuthenticator.java 2011-09-13 04:14:10 UTC (rev 1219) @@ -134,6 +134,15 @@ super.start(); } + public boolean authenticate(HttpServletRequest request, HttpServletResponse response, LoginConfig loginConfig) throws IOException + { + if(request instanceof Request == false) + throw new IOException("Not of type Catalina request"); + if(response instanceof Response == false) + throw new IOException("Not of type Catalina response"); + return authenticate((Request)request, (Response)response, loginConfig); + } + @Override public boolean authenticate(Request request, Response response, LoginConfig loginConfig) throws IOException {

12 years, 7 months

1
0
0 / 0

Picketlink SVN: r1218 - social/trunk/openid.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-09-12 23:38:43 -0400 (Mon, 12 Sep 2011) New Revision: 1218 Modified: social/trunk/openid/pom.xml Log: add dep ver Modified: social/trunk/openid/pom.xml =================================================================== --- social/trunk/openid/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) +++ social/trunk/openid/pom.xml 2011-09-13 03:38:43 UTC (rev 1218) @@ -95,6 +95,7 @@ <dependency> <groupId>apache-log4j</groupId> <artifactId>log4j</artifactId> + <version>1.2.14</version> </dependency> <dependency> <groupId>javax.servlet</groupId>

12 years, 7 months

1
0
0 / 0

Picketlink SVN: r1217 - in idm/trunk: assembly and 23 other directories.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2011-09-12 18:06:20 -0400 (Mon, 12 Sep 2011) New Revision: 1217 Modified: idm/trunk/assembly/pom.xml idm/trunk/example/auth-simple/pom.xml idm/trunk/example/auth/pom.xml idm/trunk/example/idm-servlet/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-spi/pom.xml idm/trunk/picketlink-idm-testsuite/common/pom.xml idm/trunk/picketlink-idm-testsuite/integration/ldap/pom.xml idm/trunk/picketlink-idm-testsuite/integration/ldap2/pom.xml idm/trunk/picketlink-idm-testsuite/integration/pom.xml idm/trunk/picketlink-idm-testsuite/performance/pom.xml idm/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: idm/trunk/assembly/pom.xml =================================================================== --- idm/trunk/assembly/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/assembly/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -8,7 +8,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> Modified: idm/trunk/example/auth/pom.xml =================================================================== --- idm/trunk/example/auth/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/example/auth/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -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.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</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 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/example/auth-simple/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -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.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <artifactId>example-auth-simple</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication (using deployer)</name> Modified: idm/trunk/example/idm-servlet/pom.xml =================================================================== --- idm/trunk/example/idm-servlet/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/example/idm-servlet/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -3,7 +3,7 @@ <groupId>org.jboss</groupId> <artifactId>jboss-idm-servlet</artifactId> <packaging>war</packaging> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <name>JBoss Picketlink IDM servlet</name> <url>http://maven.apache.org</url> Modified: idm/trunk/example/simple/pom.xml =================================================================== --- idm/trunk/example/simple/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/example/simple/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -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.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</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 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/integration/deployer/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> </parent> <properties> Modified: idm/trunk/integration/jboss5/pom.xml =================================================================== --- idm/trunk/integration/jboss5/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/integration/jboss5/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> </parent> <dependencies> Modified: idm/trunk/integration/pom.xml =================================================================== --- idm/trunk/integration/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/integration/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -6,14 +6,14 @@ <description>PicketLink IDM Integration</description> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>pom</packaging>  <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: idm/trunk/parent/pom.xml =================================================================== --- idm/trunk/parent/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/parent/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -8,7 +8,7 @@ <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> <packaging>pom</packaging> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <name>PicketLink IDM- Parent</name> <description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description> <licenses> @@ -521,8 +521,8 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.3....</developerConnection> - <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.3.0.Alp...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.3....</developerConnection> + <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.3.0.Alp...</url> </scm> </project> Modified: idm/trunk/picketlink-idm-api/pom.xml =================================================================== --- idm/trunk/picketlink-idm-api/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-api/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-api</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>jar</packaging> <name>PicketLink IDM API</name> <description>PicketLink IDM API contains the API to interact with the Identity Model.</description> Modified: idm/trunk/picketlink-idm-auth/pom.xml =================================================================== --- idm/trunk/picketlink-idm-auth/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-auth/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-auth</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>jar</packaging> <name>PicketLink IDM Auth</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> Modified: idm/trunk/picketlink-idm-cache/pom.xml =================================================================== --- idm/trunk/picketlink-idm-cache/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-cache/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-cache</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>jar</packaging> <name>PicketLink IDM Cache</name> <description>PicketLink IDM Cache</description> Modified: idm/trunk/picketlink-idm-common/pom.xml =================================================================== --- idm/trunk/picketlink-idm-common/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-common/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-common</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>jar</packaging> <name>PicketLink IDM Common</name> <description>PicketLink IDM Common</description> Modified: idm/trunk/picketlink-idm-core/pom.xml =================================================================== --- idm/trunk/picketlink-idm-core/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-core/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-core</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>jar</packaging> <name>PicketLink IDM Implementation</name> <description>PicketLink IDM IMPL contains the implementation of the API and the Identity Model.</description> Modified: idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml =================================================================== --- idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,14 +2,14 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>Reference-Guide-${translation}</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>User Guide (${translation})</name> Modified: idm/trunk/picketlink-idm-docs/pom.xml =================================================================== --- idm/trunk/picketlink-idm-docs/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-docs/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.docs</groupId> <artifactId>picketlink-idm-docs</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>pom</packaging> <name>PicketLink IDM Docs</name> <url>http://www.jboss.com/products/jbossidentity</url> Modified: idm/trunk/picketlink-idm-hibernate/pom.xml =================================================================== --- idm/trunk/picketlink-idm-hibernate/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-hibernate/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-hibernate</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>jar</packaging> <name>PicketLink IDM Hibernate</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> Modified: idm/trunk/picketlink-idm-ldap/pom.xml =================================================================== --- idm/trunk/picketlink-idm-ldap/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-ldap/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-ldap</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>jar</packaging> <name>PicketLink IDM LDAP</name> <description>PicketLink IDM LDAP</description> Modified: idm/trunk/picketlink-idm-spi/pom.xml =================================================================== --- idm/trunk/picketlink-idm-spi/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-spi/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-spi</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>jar</packaging> <name>PicketLink IDM SPI</name> <description>PicketLink SPI</description> Modified: idm/trunk/picketlink-idm-testsuite/common/pom.xml =================================================================== --- idm/trunk/picketlink-idm-testsuite/common/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-testsuite/common/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.testsuite</groupId> <artifactId>common</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>jar</packaging> <name>PicketLink IDM Testsuite Common</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> Modified: idm/trunk/picketlink-idm-testsuite/integration/ldap/pom.xml =================================================================== --- idm/trunk/picketlink-idm-testsuite/integration/ldap/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-testsuite/integration/ldap/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.testsuite</groupId> <artifactId>ldap</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>jar</packaging> <name>PicketLink IDM Integration Testsuite - LDAP</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> Modified: idm/trunk/picketlink-idm-testsuite/integration/ldap2/pom.xml =================================================================== --- idm/trunk/picketlink-idm-testsuite/integration/ldap2/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-testsuite/integration/ldap2/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.testsuite</groupId> <artifactId>ldap2</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>jar</packaging> <name>PicketLink IDM Integration Testsuite - 2 LDAPs</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> Modified: idm/trunk/picketlink-idm-testsuite/integration/pom.xml =================================================================== --- idm/trunk/picketlink-idm-testsuite/integration/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-testsuite/integration/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.testsuite</groupId> <artifactId>integration</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <name>PicketLink IDM Integration Testsuite</name> <description>PicketLink IDM Integration Testsuite</description> <packaging>pom</packaging> Modified: idm/trunk/picketlink-idm-testsuite/performance/pom.xml =================================================================== --- idm/trunk/picketlink-idm-testsuite/performance/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/picketlink-idm-testsuite/performance/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/trunk/pom.xml =================================================================== --- idm/trunk/pom.xml 2011-09-12 22:05:38 UTC (rev 1216) +++ idm/trunk/pom.xml 2011-09-12 22:06:20 UTC (rev 1217) @@ -2,22 +2,22 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm</groupId> <artifactId>jboss-identity-idm-pom</artifactId> - <version>1.3.0.Alpha04</version> + <version>1.3.0.Alpha05-SNAPSHOT</version> <packaging>pom</packaging> <name>PicketLink IDM - Aggregator</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> <description /> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/tags/1.3.0.Alpha04</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/tags/1.3.0.Alpha04</developerConnection> - <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.3.0.Alp...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/trunk</developerConnection> + <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/jboss-par...</url> </scm>

12 years, 7 months

1
0
0 / 0

Picketlink SVN: r1216 - idm/tags.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2011-09-12 18:05:38 -0400 (Mon, 12 Sep 2011) New Revision: 1216 Added: idm/tags/1.3.0.Alpha04/ Log: [maven-scm] copy for tag 1.3.0.Alpha04

12 years, 7 months

1
0
0 / 0

Picketlink SVN: r1215 - in idm/trunk: assembly and 23 other directories.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2011-09-12 18:05:12 -0400 (Mon, 12 Sep 2011) New Revision: 1215 Modified: idm/trunk/assembly/pom.xml idm/trunk/example/auth-simple/pom.xml idm/trunk/example/auth/pom.xml idm/trunk/example/idm-servlet/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-spi/pom.xml idm/trunk/picketlink-idm-testsuite/common/pom.xml idm/trunk/picketlink-idm-testsuite/integration/ldap/pom.xml idm/trunk/picketlink-idm-testsuite/integration/ldap2/pom.xml idm/trunk/picketlink-idm-testsuite/integration/pom.xml idm/trunk/picketlink-idm-testsuite/performance/pom.xml idm/trunk/pom.xml Log: [maven-release-plugin] prepare release 1.3.0.Alpha04 Modified: idm/trunk/assembly/pom.xml =================================================================== --- idm/trunk/assembly/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/assembly/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -8,7 +8,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../parent</relativePath> </parent> Modified: idm/trunk/example/auth/pom.xml =================================================================== --- idm/trunk/example/auth/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/example/auth/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -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.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</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 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/example/auth-simple/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -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.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <artifactId>example-auth-simple</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication (using deployer)</name> Modified: idm/trunk/example/idm-servlet/pom.xml =================================================================== --- idm/trunk/example/idm-servlet/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/example/idm-servlet/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -3,7 +3,7 @@ <groupId>org.jboss</groupId> <artifactId>jboss-idm-servlet</artifactId> <packaging>war</packaging> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <name>JBoss Picketlink IDM servlet</name> <url>http://maven.apache.org</url> Modified: idm/trunk/example/simple/pom.xml =================================================================== --- idm/trunk/example/simple/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/example/simple/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -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.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</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 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/integration/deployer/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> </parent> <properties> Modified: idm/trunk/integration/jboss5/pom.xml =================================================================== --- idm/trunk/integration/jboss5/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/integration/jboss5/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> </parent> <dependencies> Modified: idm/trunk/integration/pom.xml =================================================================== --- idm/trunk/integration/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/integration/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -6,14 +6,14 @@ <description>PicketLink IDM Integration</description> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>pom</packaging>  <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: idm/trunk/parent/pom.xml =================================================================== --- idm/trunk/parent/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/parent/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -8,7 +8,7 @@ <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> <packaging>pom</packaging> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <name>PicketLink IDM- Parent</name> <description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description> <licenses> @@ -521,8 +521,8 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.3....</developerConnection> - <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.3.0.Alp...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.3....</developerConnection> + <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.3.0.Alp...</url> </scm> </project> Modified: idm/trunk/picketlink-idm-api/pom.xml =================================================================== --- idm/trunk/picketlink-idm-api/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-api/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-api</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>jar</packaging> <name>PicketLink IDM API</name> <description>PicketLink IDM API contains the API to interact with the Identity Model.</description> Modified: idm/trunk/picketlink-idm-auth/pom.xml =================================================================== --- idm/trunk/picketlink-idm-auth/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-auth/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-auth</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>jar</packaging> <name>PicketLink IDM Auth</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> Modified: idm/trunk/picketlink-idm-cache/pom.xml =================================================================== --- idm/trunk/picketlink-idm-cache/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-cache/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-cache</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>jar</packaging> <name>PicketLink IDM Cache</name> <description>PicketLink IDM Cache</description> Modified: idm/trunk/picketlink-idm-common/pom.xml =================================================================== --- idm/trunk/picketlink-idm-common/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-common/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-common</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>jar</packaging> <name>PicketLink IDM Common</name> <description>PicketLink IDM Common</description> Modified: idm/trunk/picketlink-idm-core/pom.xml =================================================================== --- idm/trunk/picketlink-idm-core/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-core/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-core</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>jar</packaging> <name>PicketLink IDM Implementation</name> <description>PicketLink IDM IMPL contains the implementation of the API and the Identity Model.</description> Modified: idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml =================================================================== --- idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,14 +2,14 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>Reference-Guide-${translation}</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>jdocbook</packaging> <name>User Guide (${translation})</name> Modified: idm/trunk/picketlink-idm-docs/pom.xml =================================================================== --- idm/trunk/picketlink-idm-docs/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-docs/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.docs</groupId> <artifactId>picketlink-idm-docs</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>pom</packaging> <name>PicketLink IDM Docs</name> <url>http://www.jboss.com/products/jbossidentity</url> Modified: idm/trunk/picketlink-idm-hibernate/pom.xml =================================================================== --- idm/trunk/picketlink-idm-hibernate/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-hibernate/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-hibernate</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>jar</packaging> <name>PicketLink IDM Hibernate</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> Modified: idm/trunk/picketlink-idm-ldap/pom.xml =================================================================== --- idm/trunk/picketlink-idm-ldap/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-ldap/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-ldap</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>jar</packaging> <name>PicketLink IDM LDAP</name> <description>PicketLink IDM LDAP</description> Modified: idm/trunk/picketlink-idm-spi/pom.xml =================================================================== --- idm/trunk/picketlink-idm-spi/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-spi/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,12 +2,12 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-spi</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>jar</packaging> <name>PicketLink IDM SPI</name> <description>PicketLink SPI</description> Modified: idm/trunk/picketlink-idm-testsuite/common/pom.xml =================================================================== --- idm/trunk/picketlink-idm-testsuite/common/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-testsuite/common/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.testsuite</groupId> <artifactId>common</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>jar</packaging> <name>PicketLink IDM Testsuite Common</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> Modified: idm/trunk/picketlink-idm-testsuite/integration/ldap/pom.xml =================================================================== --- idm/trunk/picketlink-idm-testsuite/integration/ldap/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-testsuite/integration/ldap/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.testsuite</groupId> <artifactId>ldap</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>jar</packaging> <name>PicketLink IDM Integration Testsuite - LDAP</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> Modified: idm/trunk/picketlink-idm-testsuite/integration/ldap2/pom.xml =================================================================== --- idm/trunk/picketlink-idm-testsuite/integration/ldap2/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-testsuite/integration/ldap2/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.testsuite</groupId> <artifactId>ldap2</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>jar</packaging> <name>PicketLink IDM Integration Testsuite - 2 LDAPs</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> Modified: idm/trunk/picketlink-idm-testsuite/integration/pom.xml =================================================================== --- idm/trunk/picketlink-idm-testsuite/integration/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-testsuite/integration/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.testsuite</groupId> <artifactId>integration</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <name>PicketLink IDM Integration Testsuite</name> <description>PicketLink IDM Integration Testsuite</description> <packaging>pom</packaging> Modified: idm/trunk/picketlink-idm-testsuite/performance/pom.xml =================================================================== --- idm/trunk/picketlink-idm-testsuite/performance/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/picketlink-idm-testsuite/performance/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>../../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/trunk/pom.xml =================================================================== --- idm/trunk/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) +++ idm/trunk/pom.xml 2011-09-12 22:05:12 UTC (rev 1215) @@ -2,22 +2,22 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm</groupId> <artifactId>jboss-identity-idm-pom</artifactId> - <version>1.3.0.Alpha04-SNAPSHOT</version> + <version>1.3.0.Alpha04</version> <packaging>pom</packaging> <name>PicketLink IDM - Aggregator</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> <description /> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/trunk</developerConnection> - <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/jboss-par...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/tags/1.3.0.Alpha04</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/tags/1.3.0.Alpha04</developerConnection> + <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.3.0.Alp...</url> </scm>

12 years, 7 months

1
0
0 / 0

Picketlink SVN: r1214 - in idm/trunk: example/idm-servlet and 7 other directories.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2011-09-12 17:25:13 -0400 (Mon, 12 Sep 2011) New Revision: 1214 Removed: idm/trunk/picketlink-idm-jpa/ Modified: idm/trunk/example/idm-servlet/jboss-idm-servlet.iml idm/trunk/picketlink-idm-api/src/main/java/org/picketlink/idm/api/RelationshipManager.java idm/trunk/picketlink-idm-api/src/main/java/org/picketlink/idm/api/RoleManager.java idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/managers/RelationshipManagerImpl.java idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/managers/RoleManagerImpl.java idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/AbstractSPISearchImpl.java idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/IdentityObjectRelationshipSearchImpl.java idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/JBossCacheIdentityStoreWrapper.java idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/WrapperIdentityStoreRepository.java idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java idm/trunk/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java idm/trunk/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/store/IdentityStore.java idm/trunk/pom.xml Log: - remove jpa store for now as it is not maintained - add new methods for better paginated searches - performance tweaks for hibernate queries Modified: idm/trunk/example/idm-servlet/jboss-idm-servlet.iml =================================================================== --- idm/trunk/example/idm-servlet/jboss-idm-servlet.iml 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/example/idm-servlet/jboss-idm-servlet.iml 2011-09-12 21:25:13 UTC (rev 1214) @@ -16,11 +16,12 @@ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/target/classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <exclude-output /> <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> Modified: idm/trunk/picketlink-idm-api/src/main/java/org/picketlink/idm/api/RelationshipManager.java =================================================================== --- idm/trunk/picketlink-idm-api/src/main/java/org/picketlink/idm/api/RelationshipManager.java 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/picketlink-idm-api/src/main/java/org/picketlink/idm/api/RelationshipManager.java 2011-09-12 21:25:13 UTC (rev 1214) @@ -311,7 +311,28 @@ boolean parent, boolean cascade) throws IdentityException; + /** + * Get count of groups that are associated with given group. + * If 'parent' parameter is set to false, all parent group will be returned. If parent parameter is + * set to true and 'cascade' is set to true all nested subgroubs will be returned. + * + * @param group parent group + * @param groupType can be null + * @param parent defines if given identity is parent or child side in the + * relationship - default is true (parent) + * @param cascade if true also identities from subgroubs will be retreived. Matters only when parent is set to true. + * Default is false + * @return + * @throws org.picketlink.idm.common.exception.IdentityException + */ + int getAssociatedGroupsCount(Group group, + String groupType, + boolean parent, + boolean cascade, + IdentitySearchCriteria criteria) throws IdentityException; + + /** * Find groups that are associated with given group. * If 'parent' parameter is set to false, all parent group will be returned. If parent parameter is * set to true and 'cascade' is set to true all nested subgroubs will be returned. Modified: idm/trunk/picketlink-idm-api/src/main/java/org/picketlink/idm/api/RoleManager.java =================================================================== --- idm/trunk/picketlink-idm-api/src/main/java/org/picketlink/idm/api/RoleManager.java 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/picketlink-idm-api/src/main/java/org/picketlink/idm/api/RoleManager.java 2011-09-12 21:25:13 UTC (rev 1214) @@ -344,7 +344,32 @@ <T extends IdentityType> Collection<Role> findRoles(T identityType, RoleType roleType) throws IdentityException; + /** + * Find Role objects count with a given RoleType associated with a given IdentityType + * @param identityType + * @param roleType + * @param criteria + * @return + * @throws IdentityException + */ + int getRolesCount(IdentityType identityType, + RoleType roleType, + IdentitySearchCriteria criteria) throws IdentityException; + + /** + * Find Role objects with a given RoleType associated with a given IdentityType + * @param identityType + * @param roleType + * @param criteria + * @return + * @throws IdentityException + */ + <T extends IdentityType> Collection<Role> findRoles(T identityType, + RoleType roleType, + IdentitySearchCriteria criteria) throws IdentityException; + + /** * Find Role objects with a given RoleType name associated with IdentityType for a given key * @param key * @param roleTypeName @@ -354,7 +379,20 @@ <T extends IdentityType> Collection<Role> findRoles(String key, String roleTypeName) throws IdentityException; + /** + * Find Role objects with a given RoleType name associated with IdentityType for a given key + * @param key + * @param roleTypeName + * @param criteria + * @return + * @throws IdentityException + */ + <T extends IdentityType> Collection<Role> findRoles(String key, + String roleTypeName, + IdentitySearchCriteria criteria) throws IdentityException; + + /** * * @param role * @return Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/managers/RelationshipManagerImpl.java =================================================================== --- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/managers/RelationshipManagerImpl.java 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/managers/RelationshipManagerImpl.java 2011-09-12 21:25:13 UTC (rev 1214) @@ -856,6 +856,8 @@ private Collection<Group> findAssociatedGroupsCascaded(Collection<Group> previous, Group group, String groupType, boolean parent, IdentitySearchCriteria criteria) throws IdentityException { + getIdentitySession().save(); + Collection<Group> results = findAssociatedGroups(group, groupType, parent, false, criteria); List<Group> newResults = new LinkedList<Group>(); @@ -868,6 +870,9 @@ { newResults.add(result); previous.add(result); + + getIdentitySession().save(); + newResults.addAll(findAssociatedGroupsCascaded(previous, result, groupType, parent, criteria)); } } @@ -876,6 +881,14 @@ } + public int getAssociatedGroupsCount(Group group, String groupType, boolean parent, boolean cascade, IdentitySearchCriteria criteria) throws IdentityException + { + + //TODO: implement! + return findAssociatedGroups(group, groupType, parent, cascade, criteria).size(); + + } + public Collection<Group> findAssociatedGroups(Group group, String groupType, boolean parent, boolean cascade, IdentitySearchCriteria criteria) throws IdentityException { @@ -930,7 +943,6 @@ else { - Collection<IdentityObject> ios = getRepository(). findIdentityObject( getInvocationContext(), Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/managers/RoleManagerImpl.java =================================================================== --- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/managers/RoleManagerImpl.java 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/managers/RoleManagerImpl.java 2011-09-12 21:25:13 UTC (rev 1214) @@ -842,9 +842,73 @@ return findGroupsWithRelatedRole(user, groupType, criteria); } - public Collection<Role> findRoles(IdentityType identityType, RoleType roleType) throws IdentityException + public int getRolesCount(IdentityType identityType, RoleType roleType, IdentitySearchCriteria criteria) throws IdentityException { + //TODO: cache support + checkNotNullArgument(identityType, "IdentityType"); + + +// if (cache != null) +// { +// RoleSearchImpl search = new RoleSearchImpl(); +// search.setIdentityTypeId(identityType.getKey()); +// search.setRoleType(roleType); +// +// Collection<Role> results = cache.getRoleSearch(cacheNS, search); +// if (results != null) +// { +// return results; +// } +// } + + int relationshipsCount = 0; + + // If Identity then search for parent relationships + if (identityType instanceof User) + { + relationshipsCount = getRepository(). + getRelationshipsCount( + getInvocationContext(), + createIdentityObject(identityType), + ROLE, + false, + true, + null, + convertSearchControls(criteria)); + } + // If Group then search for child relationships + else + { + relationshipsCount = getRepository(). + getRelationshipsCount( + getInvocationContext(), + createIdentityObject(identityType), + ROLE, + true, + true, + null, + convertSearchControls(criteria)); + } + + +// if (cache != null) +// { +// RoleSearchImpl search = new RoleSearchImpl(); +// search.setIdentityTypeId(identityType.getKey()); +// search.setRoleType(roleType); +// +// cache.putRoleSearch(cacheNS, search, roles); +// +// } + + return relationshipsCount; + + } + + public Collection<Role> findRoles(IdentityType identityType, RoleType roleType, IdentitySearchCriteria criteria) throws IdentityException + { + checkNotNullArgument(identityType, "IdentityType"); //checkNotNullArgument(roleType, "RoleType"); Set<Role> roles = new HashSet<Role>(); @@ -867,12 +931,28 @@ // If Identity then search for parent relationships if (identityType instanceof User) { - relationships = getRepository().resolveRelationships(getInvocationContext(), createIdentityObject(identityType), ROLE, false, true, null); + relationships = getRepository(). + resolveRelationships( + getInvocationContext(), + createIdentityObject(identityType), + ROLE, + false, + true, + null, + convertSearchControls(criteria)); } // If Group then search for child relationships else { - relationships = getRepository().resolveRelationships(getInvocationContext(), createIdentityObject(identityType), ROLE, true, true, null); + relationships = getRepository(). + resolveRelationships( + getInvocationContext(), + createIdentityObject(identityType), + ROLE, + true, + true, + null, + convertSearchControls(criteria)); } for (IdentityObjectRelationship relationship : relationships) @@ -904,14 +984,24 @@ } - public Collection<Role> findRoles(String id, String roleTypeName) throws IdentityException + public Collection<Role> findRoles(IdentityType identityType, RoleType roleType) throws IdentityException { + return findRoles(identityType, roleType, null); + } + + public Collection<Role> findRoles(String id, String roleTypeName, IdentitySearchCriteria criteria) throws IdentityException + { checkNotNullArgument(id, "Group id or User name"); RoleType roleType = roleTypeName != null ? new SimpleRoleType(roleTypeName) : null; - return findRoles(createIdentityTypeFromId(id), roleType); + return findRoles(createIdentityTypeFromId(id), roleType, criteria); } + public <T extends IdentityType> Collection<Role> findRoles(String key, String roleTypeName) throws IdentityException + { + return findRoles(key, roleTypeName, null); + } + public Map<String, String> getProperties(RoleType roleType) throws IdentityException { checkNotNullArgument(roleType, "RoleType name"); Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/AbstractSPISearchImpl.java =================================================================== --- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/AbstractSPISearchImpl.java 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/AbstractSPISearchImpl.java 2011-09-12 21:25:13 UTC (rev 1214) @@ -39,4 +39,32 @@ { this.identityObjectSearchCriteria = identityObjectSearchCriteria; } + + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (!(o instanceof AbstractSPISearchImpl)) + { + return false; + } + + AbstractSPISearchImpl that = (AbstractSPISearchImpl)o; + + if (identityObjectSearchCriteria != null ? !identityObjectSearchCriteria.equals(that.identityObjectSearchCriteria) : that.identityObjectSearchCriteria != null) + { + return false; + } + + return true; + } + + @Override + public int hashCode() + { + return identityObjectSearchCriteria != null ? identityObjectSearchCriteria.hashCode() : 0; + } } Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/IdentityObjectRelationshipSearchImpl.java =================================================================== --- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/IdentityObjectRelationshipSearchImpl.java 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/IdentityObjectRelationshipSearchImpl.java 2011-09-12 21:25:13 UTC (rev 1214) @@ -206,4 +206,21 @@ return true; } + + @Override + public int hashCode() + { + int result = super.hashCode(); + result = 31 * result + (fromIOName != null ? fromIOName.hashCode() : 0); + result = 31 * result + (fromIOType != null ? fromIOType.hashCode() : 0); + result = 31 * result + (toIOName != null ? toIOName.hashCode() : 0); + result = 31 * result + (toIOType != null ? toIOType.hashCode() : 0); + result = 31 * result + (relationshipType != null ? relationshipType.hashCode() : 0); + result = 31 * result + (ioName != null ? ioName.hashCode() : 0); + result = 31 * result + (ioType != null ? ioType.hashCode() : 0); + result = 31 * result + (parent ? 1 : 0); + result = 31 * result + (named ? 1 : 0); + result = 31 * result + (name != null ? name.hashCode() : 0); + return result; + } } Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/JBossCacheIdentityStoreWrapper.java =================================================================== --- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/JBossCacheIdentityStoreWrapper.java 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/JBossCacheIdentityStoreWrapper.java 2011-09-12 21:25:13 UTC (rev 1214) @@ -245,6 +245,38 @@ } + public int getIdentityObjectCount(IdentityStoreInvocationContext invocationCxt, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException + { + return identityStore.getIdentityObjectCount( + invocationCxt, + identity, + relationshipType, + parent, + criteria + ); + } + + public int getIdentityObjectCount(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + Collection<IdentityObjectType> excludes, + boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException + { + return identityStore.getIdentityObjectCount( + ctx, + identity, + relationshipType, + excludes, + parent, + criteria + ); + } + public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCxt, IdentityObject identity, IdentityObjectRelationshipType relationshipType, @@ -381,12 +413,36 @@ } + public int getRelationshipsCount(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType type, + boolean parent, + boolean named, + String name, + IdentityObjectSearchCriteria searchCriteria) throws IdentityException + { + + //TODO implement cache + + return identityStore.getRelationshipsCount( + ctx, + identity, + type, + parent, + named, + name, + searchCriteria + ); + } + + public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, boolean named, - String name) throws IdentityException + String name, + IdentityObjectSearchCriteria criteria) throws IdentityException { IdentityObjectRelationshipSearchImpl search = new IdentityObjectRelationshipSearchImpl(); @@ -402,6 +458,7 @@ search.setParent(parent); search.setNamed(named); search.setName(name); + search.setIdentityObjectSearchCriteria(criteria); Set<IdentityObjectRelationship> results = cacheSupport.getIdentityObjectRelationshipSearch(getCacheNS(invocationCtx), search); @@ -411,7 +468,7 @@ } results = identityStore.resolveRelationships(invocationCtx, - identity, relationshipType, parent, named, name); + identity, relationshipType, parent, named, name, criteria); cacheSupport.putIdentityObjectRelationshipSearch(getCacheNS(invocationCtx), search, results); Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java =================================================================== --- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java 2011-09-12 21:25:13 UTC (rev 1214) @@ -828,6 +828,62 @@ } + public int getIdentityObjectCount(IdentityStoreInvocationContext invocationCxt, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException + { + //TODO: merge vs sum strategy + + int count = 0; + + Collection<IdentityStore> mappedStores = getConfiguredIdentityStores(); + + for (IdentityStore mappedStore : mappedStores) + { + count += mappedStore.getIdentityObjectCount( + invocationCxt, + identity, + relationshipType, + parent, + criteria + ); + + } + + return count; + } + + public int getIdentityObjectCount(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + Collection<IdentityObjectType> excludes, + boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException + { + + //TODO: merge vs sum strategy + + int count = 0; + + Collection<IdentityStore> mappedStores = getConfiguredIdentityStores(); + + for (IdentityStore mappedStore : mappedStores) + { + count += mappedStore.getIdentityObjectCount( + ctx, + identity, + relationshipType, + excludes, + parent, + criteria + ); + } + return count; + } + + public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCxt, IdentityObject identity, IdentityObjectRelationshipType relationshipType, @@ -1153,8 +1209,46 @@ } } - public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, boolean named, String name) throws IdentityException + public int getRelationshipsCount(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType type, + boolean parent, + boolean named, + String name, + IdentityObjectSearchCriteria searchCriteria) throws IdentityException { + + //TODO: merge vs sum strategy + + int count = 0; + + Collection<IdentityStore> mappedStores = getConfiguredIdentityStores(); + + for (IdentityStore mappedStore : mappedStores) + { + count += mappedStore.getRelationshipsCount( + ctx, + identity, + type, + parent, + named, + name, + searchCriteria + ); + } + + return count; + + } + + public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + boolean parent, + boolean named, + String name, + IdentityObjectSearchCriteria criteria) throws IdentityException + { try { Set<IdentityObjectRelationship> relationships = new HashSet<IdentityObjectRelationship>(); @@ -1173,7 +1267,8 @@ if ((!named || (named && identityStore.getSupportedFeatures().isNamedRelationshipsSupported())) && hasIdentityObject(storeCtx, identityStore, identity)) { - relationships.addAll(identityStore.resolveRelationships(storeCtx, identity, relationshipType, parent, named, name)); + relationships.addAll(identityStore. + resolveRelationships(storeCtx, identity, relationshipType, parent, named, name, criteria)); } } Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/WrapperIdentityStoreRepository.java =================================================================== --- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/WrapperIdentityStoreRepository.java 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/WrapperIdentityStoreRepository.java 2011-09-12 21:25:13 UTC (rev 1214) @@ -184,6 +184,38 @@ return defaultIdentityStore.findIdentityObject(resolveIdentityStoreInvocationContext(invocationCtx), identityType, criteria); } + public int getIdentityObjectCount(IdentityStoreInvocationContext invocationCxt, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException + { + return defaultIdentityStore.getIdentityObjectCount( + invocationCxt, + identity, + relationshipType, + parent, + criteria + ); + } + + public int getIdentityObjectCount(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + Collection<IdentityObjectType> excludes, + boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException + { + return defaultIdentityStore.getIdentityObjectCount( + ctx, + identity, + relationshipType, + excludes, + parent, + criteria + ); + } + public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, IdentityObjectRelationshipType relationshipType, @@ -239,15 +271,37 @@ return defaultIdentityStore.resolveRelationships(resolveIdentityStoreInvocationContext(invocationCxt), fromIdentity, toIdentity, relationshipType); } + + + public int getRelationshipsCount(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType type, + boolean parent, + boolean named, + String name, + IdentityObjectSearchCriteria searchCriteria) throws IdentityException + { + return defaultIdentityStore.getRelationshipsCount( + ctx, + identity, + type, + parent, + named, + name, + searchCriteria + ); + } + public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, boolean named, - String name) throws IdentityException + String name, + IdentityObjectSearchCriteria criteria) throws IdentityException { return defaultIdentityStore.resolveRelationships(resolveIdentityStoreInvocationContext(invocationCtx), - identity, relationshipType, parent, named, name); + identity, relationshipType, parent, named, name, criteria); } public String createRelationshipName(IdentityStoreInvocationContext ctx, Modified: idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2011-09-12 21:25:13 UTC (rev 1214) @@ -795,17 +795,63 @@ return findIdentityObject(ctx, identityType, null); } + public int getIdentityObjectCount(IdentityStoreInvocationContext invocationCxt, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException + { + return getIdentityObjectCount(invocationCxt, identity, relationshipType, null, parent, criteria); + } @SuppressWarnings("unchecked") public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCxt, IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, - IdentityObjectSearchCriteria criteria) throws IdentityException + IdentityObjectSearchCriteria criteria) throws IdentityException { return findIdentityObject(invocationCxt, identity, relationshipType, null, parent, criteria); } + + public int getIdentityObjectCount(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + Collection<IdentityObjectType> excludes, + boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException + { + int result; + + try + { + org.hibernate.Query q = prepareIdentityObjectQuery( + ctx, + identity, + relationshipType, + excludes, + parent, + criteria, + false); + + + result = ((Integer)q.iterate().next() ).intValue(); + } + catch (Exception e) + { + if (log.isLoggable(Level.FINER)) + { + log.log(Level.FINER, "Exception occurred: ", e); + } + + throw new IdentityException("Cannot get IdentityObject count", e); + } + + return result; + + } + @SuppressWarnings("unchecked") public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext ctx, IdentityObject identity, @@ -814,12 +860,61 @@ boolean parent, IdentityObjectSearchCriteria criteria) throws IdentityException { + + List<IdentityObject> results; + + try + { + org.hibernate.Query q = prepareIdentityObjectQuery( + ctx, + identity, + relationshipType, + excludes, + parent, + criteria, + false); + + + results = q.list(); + Hibernate.initialize(results); + + + } + catch (Exception e) + { + if (log.isLoggable(Level.FINER)) + { + log.log(Level.FINER, "Exception occurred: ", e); + } + + throw new IdentityException("Cannot find IdentityObjects", e); + } + + if (criteria != null && criteria.isFiltered()) + { + filterByAttributesValues(results, criteria.getValues()); + if (criteria.isPaged()) + { + results = (LinkedList)cutPageFromResults(results, criteria); + } + } + + return results; + } + + @SuppressWarnings("unchecked") + public org.hibernate.Query prepareIdentityObjectQuery(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + Collection<IdentityObjectType> excludes, + boolean parent, + IdentityObjectSearchCriteria criteria, + boolean count) throws IdentityException + { //TODO:test HibernateIdentityObject hibernateObject = safeGet(ctx, identity); - List<IdentityObject> results; - boolean orderByName = false; boolean ascending = true; @@ -829,10 +924,12 @@ ascending = criteria.isAscending(); } + org.hibernate.Query q = null; + try { - org.hibernate.Query q = null; + StringBuilder hqlString = new StringBuilder(""); @@ -841,16 +938,24 @@ if (parent) { + if (count) + { + hqlString.append("select count(distinct ior.toIdentityObject) from HibernateIdentityObjectRelationship ior where "); + + } + else + { + hqlString.append("select distinct ior.toIdentityObject from HibernateIdentityObjectRelationship ior where "); + } + if (relationshipType != null) { - hqlString.append("select distinct ior.toIdentityObject from HibernateIdentityObjectRelationship ior where " + - "ior.toIdentityObject.name like :nameFilter and ior.type.name = :relType and ior.fromIdentityObject = :identity"); + hqlString.append("ior.toIdentityObject.name like :nameFilter and ior.type.name = :relType and ior.fromIdentityObject = :identity"); } else { - hqlString.append("select distinct ior.toIdentityObject from HibernateIdentityObjectRelationship ior where " + - "ior.toIdentityObject.name like :nameFilter and ior.fromIdentityObject = :identity"); + hqlString.append("ior.toIdentityObject.name like :nameFilter and ior.fromIdentityObject = :identity"); } if (excludes != null && excludes.size() > 0) @@ -859,7 +964,7 @@ int i = 0; for (IdentityObjectType exclude : excludes) { - hqlString.append(" and ior.toIdentityObject.identityType.name != ") + hqlString.append(" and ior.toIdentityObject.identityType.id <> ") .append(":exclude" + i++); } } @@ -875,15 +980,24 @@ } else { + + if (count) + { + hqlString.append("select count(distinct ior.fromIdentityObject) from HibernateIdentityObjectRelationship ior where "); + + } + else + { + hqlString.append("select distinct ior.fromIdentityObject from HibernateIdentityObjectRelationship ior where "); + } + if (relationshipType != null) { - hqlString.append("select distinct ior.fromIdentityObject from HibernateIdentityObjectRelationship ior where " + - "ior.fromIdentityObject.name like :nameFilter and ior.type.name = :relType and ior.toIdentityObject = :identity"); + hqlString.append("ior.fromIdentityObject.name like :nameFilter and ior.type.name = :relType and ior.toIdentityObject = :identity"); } else { - hqlString.append("select distinct ior.fromIdentityObject from HibernateIdentityObjectRelationship ior where " + - "ior.fromIdentityObject.name like :nameFilter and ior.toIdentityObject = :identity"); + hqlString.append("ior.fromIdentityObject.name like :nameFilter and ior.toIdentityObject = :identity"); } if (excludes != null && excludes.size() > 0) @@ -891,7 +1005,7 @@ int i = 0; for (IdentityObjectType exclude : excludes) { - hqlString.append(" and ior.fromIdentityObject.identityType.name != ") + hqlString.append(" and ior.fromIdentityObject.identityType.id <> ") .append(":exclude" + i++); } } @@ -930,7 +1044,8 @@ int i = 0; for (IdentityObjectType exclude : excludes) { - q.setParameter("exclude" + i++, exclude.getName()); + HibernateIdentityObjectType exType = getHibernateIdentityObjectType(ctx, exclude); + q.setParameter("exclude" + i++, exType.getId()); } } if (criteria != null && criteria.isPaged() && !criteria.isFiltered()) @@ -944,10 +1059,6 @@ q.setCacheable(true); - results = q.list(); - Hibernate.initialize(results); - - } catch (Exception e) { @@ -956,19 +1067,10 @@ log.log(Level.FINER, "Exception occurred: ", e); } - throw new IdentityException("Cannot find IdentityObjects", e); + throw new IdentityException("Cannot prepare hibernate query", e); } - if (criteria != null && criteria.isFiltered()) - { - filterByAttributesValues(results, criteria.getValues()); - if (criteria.isPaged()) - { - results = (LinkedList)cutPageFromResults(results, criteria); - } - } - - return results; + return q; } public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext ctx, @@ -1219,16 +1321,80 @@ return new HashSet<IdentityObjectRelationship>(results); } + + public int getRelationshipsCount(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType type, + boolean parent, + boolean named, + String name, + IdentityObjectSearchCriteria searchCriteria) throws IdentityException + { + + Criteria criteria = prepareResolveRelationshipsCriteria( + ctx, + identity, + type, + parent, + named, + name, + searchCriteria + ); + + criteria.setProjection(Projections.rowCount()); + + Iterator result = criteria.list().iterator(); + + + if (!result.hasNext()) + { + return 0; + } + + return (Integer)result.next(); + + } + + public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectRelationshipType type, boolean parent, boolean named, - String name) throws IdentityException + String name, + IdentityObjectSearchCriteria searchCriteria) throws IdentityException { HibernateIdentityObject hio = safeGet(ctx, identity); + Criteria criteria = prepareResolveRelationshipsCriteria( + ctx, + identity, + type, + parent, + named, + name, + searchCriteria + ); + + List<HibernateIdentityObjectRelationship> results = criteria.list(); + + Hibernate.initialize(results); + + return new HashSet<IdentityObjectRelationship>(results); + } + + public Criteria prepareResolveRelationshipsCriteria(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType type, + boolean parent, + boolean named, + String name, + IdentityObjectSearchCriteria searchCriteria) throws IdentityException + { + HibernateIdentityObject hio = safeGet(ctx, identity); + + Criteria criteria = getHibernateSession(ctx).createCriteria(HibernateIdentityObjectRelationship.class); criteria.setCacheable(true); @@ -1264,11 +1430,17 @@ criteria.setFetchMode("fromIdentityObject", FetchMode.JOIN); criteria.setFetchMode("toIdentityObject", FetchMode.JOIN); - List<HibernateIdentityObjectRelationship> results = criteria.list(); + if (searchCriteria != null && searchCriteria.isPaged() && !searchCriteria.isFiltered()) + { + if (searchCriteria.getMaxResults() > 0) + { + criteria.setMaxResults(searchCriteria.getMaxResults()); + } + criteria.setFirstResult(searchCriteria.getFirstResult()); + } - Hibernate.initialize(results); - return new HashSet<IdentityObjectRelationship>(results); + return criteria; } public String createRelationshipName(IdentityStoreInvocationContext ctx, String name) throws IdentityException, OperationNotSupportedException 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 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2011-09-12 21:25:13 UTC (rev 1214) @@ -1120,7 +1120,37 @@ return findIdentityObject(invocationCxt, identity, relationshipType, null, parent, criteria); } + public int getIdentityObjectCount(IdentityStoreInvocationContext invocationCxt, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException + { + return findIdentityObject( + invocationCxt, + identity, + relationshipType, + parent, + criteria).size(); + } + public int getIdentityObjectCount(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + Collection<IdentityObjectType> excludes, + boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException + { + return findIdentityObject( + ctx, + identity, + relationshipType, + excludes, + parent, + criteria + ).size(); + } + public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectRelationshipType relationshipType, @@ -1531,12 +1561,18 @@ return objects; } + public int getRelationshipsCount(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectRelationshipType type, boolean parent, boolean named, String name, IdentityObjectSearchCriteria searchCriteria) throws IdentityException + { + return resolveRelationships(ctx, identity, type, parent, named, name, searchCriteria).size(); + } + public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectRelationshipType type, boolean parent, boolean named, - String name) throws IdentityException + String name, + IdentityObjectSearchCriteria searchCriteria) throws IdentityException { if (log.isLoggable(Level.FINER)) Modified: idm/trunk/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/store/IdentityStore.java =================================================================== --- idm/trunk/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/store/IdentityStore.java 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/store/IdentityStore.java 2011-09-12 21:25:13 UTC (rev 1214) @@ -182,12 +182,51 @@ * @throws IdentityException */ Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCxt, IdentityObject identity, - IdentityObjectRelationshipType relationshipType, - Collection<IdentityObjectType> excludes, - boolean parent, - IdentityObjectSearchCriteria criteria) throws IdentityException; + IdentityObjectRelationshipType relationshipType, + Collection<IdentityObjectType> excludes, + boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException; + /** + * Get count of relationship with given identity. Relationships are directional (from parent to child). + * + * @param invocationCxt + * @param identity + * @param relationshipType + * @param parent defines if given identity is parent or child side in the + * relationship - default is true (parent) + * @param criteria + * @return + * @throws IdentityException + */ + int getIdentityObjectCount(IdentityStoreInvocationContext invocationCxt, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException; + + /** + * Get count of relationship with given identity. Relationships are directional (from parent to child). + * + * @param ctx + * @param identity + * @param relationshipType + * @param excludes list of object types to not include in search + * @param parent defines if given identity is parent or child side in the + * relationship - default is true (parent) + * @param criteria + * @return + * @throws IdentityException + */ + public int getIdentityObjectCount(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + Collection<IdentityObjectType> excludes, + boolean parent, + IdentityObjectSearchCriteria criteria) throws IdentityException; + + /** * Create directional relationship of a given type between identities * @@ -252,12 +291,32 @@ /** + * Get count of relationships for a given IdentityObject. Relationships can be directional and parent switch defines which + * role identity play in it. + * @param ctx + * @param identity + * @param named + * @param name - can be null + * @param searchCriteria + * @return + * @throws IdentityException + */ + public int getRelationshipsCount(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectRelationshipType type, + boolean parent, + boolean named, + String name, + IdentityObjectSearchCriteria searchCriteria) throws IdentityException; + + /** * Resolve relationships for a given IdentityObject. Relationships can be directional and parent switch defines which * role identity play in it. * @param invocationCxt * @param identity * @param named - * @param name - can be null + * @param name - can be null + * @param criteria * @return * @throws IdentityException */ @@ -266,10 +325,12 @@ IdentityObjectRelationshipType relationshipType, boolean parent, boolean named, - String name) + String name, + IdentityObjectSearchCriteria criteria) throws IdentityException; + // Named relationships /** Modified: idm/trunk/pom.xml =================================================================== --- idm/trunk/pom.xml 2011-09-12 12:09:55 UTC (rev 1213) +++ idm/trunk/pom.xml 2011-09-12 21:25:13 UTC (rev 1214) @@ -35,13 +35,10 @@ <module>picketlink-idm-core</module> <module>picketlink-idm-testsuite/common</module> <module>picketlink-idm-hibernate</module> - <module>picketlink-idm-jpa</module> <module>picketlink-idm-ldap</module> <module>picketlink-idm-cache</module> <module>picketlink-idm-auth</module> <module>picketlink-idm-testsuite/integration</module> - <module>integration</module> - <module>picketlink-idm-docs</module> </modules> </profile> <profile> @@ -57,7 +54,6 @@ <module>picketlink-idm-core</module> <module>picketlink-idm-testsuite/common</module> <module>picketlink-idm-hibernate</module> - <module>picketlink-idm-jpa</module> <module>picketlink-idm-ldap</module> <module>picketlink-idm-cache</module> <module>picketlink-idm-auth</module> @@ -74,7 +70,6 @@ <module>picketlink-idm-core</module> <module>picketlink-idm-testsuite/common</module> <module>picketlink-idm-hibernate</module> - <module>picketlink-idm-jpa</module> <module>picketlink-idm-ldap</module> <module>picketlink-idm-cache</module> <module>picketlink-idm-auth</module> @@ -107,7 +102,6 @@ <module>picketlink-idm-core</module> <module>picketlink-idm-testsuite/common</module> <module>picketlink-idm-hibernate</module> - <module>picketlink-idm-jpa</module> <module>picketlink-idm-ldap</module> <module>picketlink-idm-cache</module> <module>picketlink-idm-auth</module>

12 years, 7 months

1
0
0 / 0

Picketlink SVN: r1213 - integration-tests/branches/product/picketlink-trust-eap5-native.

by picketlink-commits＠lists.jboss.org

Author: pskopek(a)redhat.com Date: 2011-09-12 08:09:55 -0400 (Mon, 12 Sep 2011) New Revision: 1213 Modified: integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml Log: Fixed error in test client classpath definition. Modified: integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml 2011-09-08 13:39:47 UTC (rev 1212) +++ integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml 2011-09-12 12:09:55 UTC (rev 1213) @@ -47,6 +47,18 @@ <additionalClasspathElement>${eap-home}/client/jbossall-client.jar</additionalClasspathElement> <additionalClasspathElement>${eap-home}/common/lib/picketlink-core-${pl-version}.jar</additionalClasspathElement> <additionalClasspathElement>${eap-home}/lib/endorsed/xercesImpl.jar</additionalClasspathElement> + + <additionalClasspathElement>${eap-home}/client/jbossws-native-core.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/client/jbossws-native-client.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/client/jbossws-spi.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/client/jbossws-native-factories.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/client/jbossws-common.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/client/jboss-xml-binding.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/client/mail.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/client/wsdl4j.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/client/wstx.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/common/lib/servlet-api.jar</additionalClasspathElement> + </additionalClasspathElements> </configuration> </plugin>

12 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

picketlink-commits September 2011