November 2010 - picketlink-commits

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2010-11-25 17:19:40 -0500 (Thu, 25 Nov 2010) New Revision: 565 Added: idm/tags/1.1.7.GA/ Log: [maven-scm] copy for tag 1.1.7.GA Copied: idm/tags/1.1.7.GA (from rev 564, idm/branches/1.1.0)

14 years

1
0
0 / 0

Picketlink SVN: r564 - in idm/branches/1.1.0: assembly and 18 other directories.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2010-11-25 17:19:12 -0500 (Thu, 25 Nov 2010) New Revision: 564 Modified: idm/branches/1.1.0/assembly/pom.xml idm/branches/1.1.0/example/auth-simple/pom.xml idm/branches/1.1.0/example/auth/pom.xml idm/branches/1.1.0/example/simple/pom.xml idm/branches/1.1.0/integration/deployer/pom.xml idm/branches/1.1.0/integration/jboss5/pom.xml idm/branches/1.1.0/integration/pom.xml idm/branches/1.1.0/parent/pom.xml idm/branches/1.1.0/picketlink-idm-api/pom.xml idm/branches/1.1.0/picketlink-idm-auth/pom.xml idm/branches/1.1.0/picketlink-idm-cache/pom.xml idm/branches/1.1.0/picketlink-idm-common/pom.xml idm/branches/1.1.0/picketlink-idm-core/pom.xml idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml idm/branches/1.1.0/picketlink-idm-docs/pom.xml idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml idm/branches/1.1.0/picketlink-idm-ldap/pom.xml idm/branches/1.1.0/picketlink-idm-spi/pom.xml idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml idm/branches/1.1.0/pom.xml Log: [maven-release-plugin] prepare release 1.1.7.GA Modified: idm/branches/1.1.0/assembly/pom.xml =================================================================== --- idm/branches/1.1.0/assembly/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/assembly/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -8,7 +8,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>../parent</relativePath> </parent> Modified: idm/branches/1.1.0/example/auth/pom.xml =================================================================== --- idm/branches/1.1.0/example/auth/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/example/auth/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <artifactId>example-auth</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication</name> Modified: idm/branches/1.1.0/example/auth-simple/pom.xml =================================================================== --- idm/branches/1.1.0/example/auth-simple/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/example/auth-simple/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <artifactId>example-auth-simple</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication (using deployer)</name> Modified: idm/branches/1.1.0/example/simple/pom.xml =================================================================== --- idm/branches/1.1.0/example/simple/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/example/simple/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <artifactId>example-simple</artifactId> <packaging>jar</packaging> <name>Example - Simple PicketLink IDM Maven2 project</name> Modified: idm/branches/1.1.0/integration/deployer/pom.xml =================================================================== --- idm/branches/1.1.0/integration/deployer/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/integration/deployer/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> </parent> <properties> Modified: idm/branches/1.1.0/integration/jboss5/pom.xml =================================================================== --- idm/branches/1.1.0/integration/jboss5/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/integration/jboss5/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> </parent> <dependencies> Modified: idm/branches/1.1.0/integration/pom.xml =================================================================== --- idm/branches/1.1.0/integration/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/integration/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -12,7 +12,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: idm/branches/1.1.0/parent/pom.xml =================================================================== --- idm/branches/1.1.0/parent/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/parent/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -8,7 +8,7 @@ <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> <packaging>pom</packaging> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <name>PicketLink IDM- Parent</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> <description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description> @@ -520,4 +520,10 @@ </dependency> </dependencies> </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.1....</developerConnection> + <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1.7.GA</url> + </scm> </project> Modified: idm/branches/1.1.0/picketlink-idm-api/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-api/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/picketlink-idm-api/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-auth/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-auth/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/picketlink-idm-auth/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-cache/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-cache/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/picketlink-idm-cache/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-common/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-common/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/picketlink-idm-common/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-core/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-core/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/picketlink-idm-core/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>../../parent</relativePath> </parent> Modified: idm/branches/1.1.0/picketlink-idm-docs/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-docs/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/picketlink-idm-docs/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-ldap/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-ldap/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/picketlink-idm-ldap/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-spi/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-spi/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/picketlink-idm-spi/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/pom.xml =================================================================== --- idm/branches/1.1.0/pom.xml 2010-11-25 21:58:33 UTC (rev 563) +++ idm/branches/1.1.0/pom.xml 2010-11-25 22:19:12 UTC (rev 564) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.7.CR02-SNAPSHOT</version> + <version>1.1.7.GA</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,9 +14,9 @@ <description /> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/branches/1.1.0</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/branches/1.1.0</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.1.7.GA</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/tags/1.1.7.GA</developerConnection> + <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1.7.GA</url> </scm> <profiles>

14 years

1
0
0 / 0

Picketlink SVN: r563 - in idm/branches/1.1.0: picketlink-idm-core/src/main/java/org/picketlink/idm/impl/helper and 3 other directories.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2010-11-25 16:58:33 -0500 (Thu, 25 Nov 2010) New Revision: 563 Modified: idm/branches/1.1.0/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAPICacheProviderImpl.java idm/branches/1.1.0/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheIdentityStoreCacheProviderImpl.java idm/branches/1.1.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/helper/Tools.java idm/branches/1.1.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/types/SimpleIdentityObjectRelationshipType.java idm/branches/1.1.0/picketlink-idm-core/src/test/java/org/picketlink/idm/impl/SimpleIdentityObjectRelationshipTypeImpl.java idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java Log: - caching improvements for LDAP store - more defensive code to prevent NPEs from method that should not return null... Modified: idm/branches/1.1.0/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAPICacheProviderImpl.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAPICacheProviderImpl.java 2010-11-24 23:56:13 UTC (rev 562) +++ idm/branches/1.1.0/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAPICacheProviderImpl.java 2010-11-25 21:58:33 UTC (rev 563) @@ -256,12 +256,14 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, user); - ioNode.put(NODE_OBJECT_KEY, user); - - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "User stored in cache: " + user.getId() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "User stored in cache: " + user.getId() + ";namespace=" + ns); + } } } @@ -304,13 +306,16 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, unmodifiableCollection(users)); - - if (log.isLoggable(Level.FINER)) + if (ioNode != null) { + ioNode.put(NODE_OBJECT_KEY, unmodifiableCollection(users)); - log.finer(this.toString() + "User criteria search stored in cache: users.size()=" + users.size() + - "; criteria.hash()=" + criteria + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + + log.finer(this.toString() + "User criteria search stored in cache: users.size()=" + users.size() + + "; criteria.hash()=" + criteria + ";namespace=" + ns); + } } } @@ -355,11 +360,14 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, count); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, count); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Users count stored in cache: " + count + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Users count stored in cache: " + count + ";namespace=" + ns); + } } } @@ -404,11 +412,14 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, group); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, group); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Group stored in cache: " + group.getKey() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Group stored in cache: " + group.getKey() + ";namespace=" + ns); + } } } @@ -452,12 +463,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, unmodifiableCollection(groups)); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, unmodifiableCollection(groups)); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Group criteria search stored in cache: groups.size()=" + groups.size() + - "; criteria.hash()=" + criteria + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Group criteria search stored in cache: groups.size()=" + groups.size() + + "; criteria.hash()=" + criteria + ";namespace=" + ns); + } } } @@ -502,12 +516,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, count); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, count); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Group count stored in cache: type=" + groupType + "; count=" + count - + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Group count stored in cache: type=" + groupType + "; count=" + count + + ";namespace=" + ns); + } } } @@ -553,12 +570,14 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, role); - ioNode.put(NODE_OBJECT_KEY, role); - - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Role stored in cache: " + role + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Role stored in cache: " + role + ";namespace=" + ns); + } } } @@ -595,11 +614,14 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, role); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, role); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "RoleType stored in cache: name=" + role.getName() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "RoleType stored in cache: name=" + role.getName() + ";namespace=" + ns); + } } } @@ -635,12 +657,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, Collections.unmodifiableMap(attributes)); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, Collections.unmodifiableMap(attributes)); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Attributes stored in cache: id=" + id + "; attributes.size()=" - + attributes.size() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Attributes stored in cache: id=" + id + "; attributes.size()=" + + attributes.size() + ";namespace=" + ns); + } } } @@ -690,12 +715,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, Collections.unmodifiableMap(properties)); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, Collections.unmodifiableMap(properties)); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Role properties stored in cache: role=" + role + "; properties.size()=" - + properties.size() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Role properties stored in cache: role=" + role + "; properties.size()=" + + properties.size() + ";namespace=" + ns); + } } } @@ -745,12 +773,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, Collections.unmodifiableMap(properties)); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, Collections.unmodifiableMap(properties)); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "RoleType properties stored in cache: roleType=" + roleType - + "; properties.size()=" + properties.size() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "RoleType properties stored in cache: roleType=" + roleType + + "; properties.size()=" + properties.size() + ";namespace=" + ns); + } } } @@ -818,12 +849,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, unmodifiableCollection(results)); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, unmodifiableCollection(results)); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "User search stored in cache: results.size()=" + results.size() - + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "User search stored in cache: results.size()=" + results.size() + + ";namespace=" + ns); + } } } @@ -855,11 +889,14 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, unmodifiableCollection(results)); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, unmodifiableCollection(results)); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Group search stored in cache: results.size()=" + results.size() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Group search stored in cache: results.size()=" + results.size() + ";namespace=" + ns); + } } } @@ -890,11 +927,14 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, result); + if (ioNode == null) + { + ioNode.put(NODE_OBJECT_KEY, result); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Relationship search stored in cache: result=" + result + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Relationship search stored in cache: result=" + result + ";namespace=" + ns); + } } } @@ -925,11 +965,14 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, unmodifiableCollection(results)); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, unmodifiableCollection(results)); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Role search stored in cache: results.size()=" + results.size() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Role search stored in cache: results.size()=" + results.size() + ";namespace=" + ns); + } } } @@ -960,11 +1003,14 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, unmodifiableCollection(results)); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, unmodifiableCollection(results)); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "RoleType search stored in cache: results.size()=" + results.size() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "RoleType search stored in cache: results.size()=" + results.size() + ";namespace=" + ns); + } } } @@ -1007,12 +1053,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_QUERY_KEY, results); + if (ioNode != null) + { + ioNode.put(NODE_QUERY_KEY, results); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "User query stored in cache: q.hashCode()=" + q.hashCode() - + "; results.size()=" + results.size() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "User query stored in cache: q.hashCode()=" + q.hashCode() + + "; results.size()=" + results.size() + ";namespace=" + ns); + } } } @@ -1022,12 +1071,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_QUERY_UNIQUE_KEY, user); + if (ioNode != null) + { + ioNode.put(NODE_QUERY_UNIQUE_KEY, user); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "User query stored in cache: q.hashCode()=" + q.hashCode() + "; user=" + user - + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "User query stored in cache: q.hashCode()=" + q.hashCode() + "; user=" + user + + ";namespace=" + ns); + } } } @@ -1089,12 +1141,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_QUERY_KEY, unmodifiableCollection(results)); + if (ioNode != null) + { + ioNode.put(NODE_QUERY_KEY, unmodifiableCollection(results)); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Group query stored in cache: q.hashCode()=" + q.hashCode() - + "; results.size()=" + results.size() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Group query stored in cache: q.hashCode()=" + q.hashCode() + + "; results.size()=" + results.size() + ";namespace=" + ns); + } } } @@ -1104,12 +1159,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_QUERY_UNIQUE_KEY, group); + if (ioNode != null) + { + ioNode.put(NODE_QUERY_UNIQUE_KEY, group); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Group query stored in cache: q.hashCode()=" + q.hashCode() - + "; group=" + group + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Group query stored in cache: q.hashCode()=" + q.hashCode() + + "; group=" + group + ";namespace=" + ns); + } } } @@ -1171,26 +1229,33 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_QUERY_KEY, results); + if (ioNode != null) + { + ioNode.put(NODE_QUERY_KEY, results); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Role query stored in cache: q.hashCode()=" + q.hashCode() - + "; results.size()=" + results.size() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Role query stored in cache: q.hashCode()=" + q.hashCode() + + "; results.size()=" + results.size() + ";namespace=" + ns); + } } } + public void putRoleQueryUnique(String ns, RoleQuery q, Role role) { Fqn nodeFqn = getFqn(ns, NODE_ROLE_QUERIES, q.hashCode()); Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_QUERY_UNIQUE_KEY, role); + if (ioNode != null) + { + ioNode.put(NODE_QUERY_UNIQUE_KEY, role); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Role query stored in cache: q.hashCode()=" + q.hashCode() + "; role=" + role - + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Role query stored in cache: q.hashCode()=" + q.hashCode() + "; role=" + role + + ";namespace=" + ns); + } } } @@ -1248,6 +1313,10 @@ private Collection unmodifiableCollection(Collection collection) { + if (collection == null) + { + return collection; + } if (collection instanceof List) { return Collections.unmodifiableList((List)collection); Modified: idm/branches/1.1.0/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheIdentityStoreCacheProviderImpl.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheIdentityStoreCacheProviderImpl.java 2010-11-24 23:56:13 UTC (rev 562) +++ idm/branches/1.1.0/picketlink-idm-cache/src/main/java/org/picketlink/idm/impl/cache/JBossCacheIdentityStoreCacheProviderImpl.java 2010-11-25 21:58:33 UTC (rev 563) @@ -246,12 +246,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, count); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, count); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "IdentityObject count stored in cache: " + count + "; type=" + type - + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "IdentityObject count stored in cache: " + count + "; type=" + type + + ";namespace=" + ns); + } } } @@ -298,12 +301,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, safeCopyIO(results)); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, safeCopyIO(results)); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "IdentityObject search stored in cache: results.size()=" + results.size() - + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "IdentityObject search stored in cache: results.size()=" + results.size() + + ";namespace=" + ns); + } } } @@ -344,12 +350,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, safeCopyIOR(results)); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, safeCopyIOR(results)); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "IdentityObjectRelationship search stored in cache: results.size()=" + results.size() - + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "IdentityObjectRelationship search stored in cache: results.size()=" + results.size() + + ";namespace=" + ns); + } } } @@ -390,12 +399,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, results); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, results); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "IdentityObjectRelationshipName search stored in cache: results.size()=" + results.size() - + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "IdentityObjectRelationshipName search stored in cache: results.size()=" + results.size() + + ";namespace=" + ns); + } } } @@ -436,12 +448,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, properties); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, properties); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "IdentityObjectRelationship properties stored in cache: relationship=" - + relationship + "; properties.size()=" + properties.size() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "IdentityObjectRelationship properties stored in cache: relationship=" + + relationship + "; properties.size()=" + properties.size() + ";namespace=" + ns); + } } } @@ -501,12 +516,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, properties); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, properties); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "IdentityObjectRelationshipName properties stored in cache: name=" - + name + "; properties.size()=" + properties.size() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "IdentityObjectRelationshipName properties stored in cache: name=" + + name + "; properties.size()=" + properties.size() + ";namespace=" + ns); + } } } @@ -559,12 +577,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, safeCopyAttr(attributes)); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, safeCopyAttr(attributes)); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "IdentityObject attributes stored in cache: io=" + io - + "; attributes.size()=" + attributes.size() + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "IdentityObject attributes stored in cache: io=" + io + + "; attributes.size()=" + attributes.size() + ";namespace=" + ns); + } } } @@ -614,12 +635,15 @@ Node ioNode = getCache().getRoot().addChild(nodeFqn); - ioNode.put(NODE_OBJECT_KEY, value); + if (ioNode != null) + { + ioNode.put(NODE_OBJECT_KEY, value); - if (log.isLoggable(Level.FINER)) - { - log.finer(this.toString() + "Object stored in cache: hash=" + hash - + "; value=" + value + ";namespace=" + ns); + if (log.isLoggable(Level.FINER)) + { + log.finer(this.toString() + "Object stored in cache: hash=" + hash + + "; value=" + value + ";namespace=" + ns); + } } } Modified: idm/branches/1.1.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/helper/Tools.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/helper/Tools.java 2010-11-24 23:56:13 UTC (rev 562) +++ idm/branches/1.1.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/helper/Tools.java 2010-11-25 21:58:33 UTC (rev 563) @@ -22,10 +22,14 @@ package org.picketlink.idm.impl.helper; +import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Enumeration; import java.util.ArrayList; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> @@ -161,4 +165,71 @@ } return sb.toString(); } + + public static void logMethodIn(Logger log, Level level, String methodName, Object[] args) + { + try + { + StringBuilder sb = new StringBuilder(); + sb.append("Method '") + .append(methodName) + .append("' called with arguments: "); + + if (args != null) + { + for (Object arg : args) + { + if (arg != null && arg instanceof Object[]) + { + sb.append(Arrays.toString((Object[])arg)) + .append("; "); + } + else + { + sb.append(arg) + .append("; "); + } + } + } + log.log(level, sb.toString()); + } + catch (Throwable t) + { + log.log(level, "Error in logging code block (not related to application code): ", t); + } + + } + + public static void logMethodOut(Logger log, Level level, String methodName, Object result) + { + try + { + StringBuilder sb = new StringBuilder(); + sb.append("Method '") + .append(methodName) + .append("' returning object: "); + + if (result != null && result instanceof Collection) + { + sb.append("Collection of size: ").append(((Collection)result).size()); + } + else + { + if (result != null) + { + sb.append("[").append(result.getClass().getCanonicalName()).append("]"); + } + sb.append(result); + } + + log.log(level, sb.toString()); + + } + catch (Throwable t) + { + log.log(level, "Error in logging code block (not related to application code): ", t); + } + } + + } Modified: idm/branches/1.1.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/types/SimpleIdentityObjectRelationshipType.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/types/SimpleIdentityObjectRelationshipType.java 2010-11-24 23:56:13 UTC (rev 562) +++ idm/branches/1.1.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/types/SimpleIdentityObjectRelationshipType.java 2010-11-25 21:58:33 UTC (rev 563) @@ -41,4 +41,12 @@ { return name; } + + @Override + public String toString() + { + return "SimpleIdentityObjectRelationshipType{" + + "name='" + name + '\'' + + '}'; + } } Modified: idm/branches/1.1.0/picketlink-idm-core/src/test/java/org/picketlink/idm/impl/SimpleIdentityObjectRelationshipTypeImpl.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-core/src/test/java/org/picketlink/idm/impl/SimpleIdentityObjectRelationshipTypeImpl.java 2010-11-24 23:56:13 UTC (rev 562) +++ idm/branches/1.1.0/picketlink-idm-core/src/test/java/org/picketlink/idm/impl/SimpleIdentityObjectRelationshipTypeImpl.java 2010-11-25 21:58:33 UTC (rev 563) @@ -41,4 +41,12 @@ { return name; } + + @Override + public String toString() + { + return "SimpleIdentityObjectRelationshipTypeImpl{" + + "name='" + name + '\'' + + '}'; + } } Modified: idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2010-11-24 23:56:13 UTC (rev 562) +++ idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2010-11-25 21:58:33 UTC (rev 563) @@ -329,6 +329,30 @@ IdentityObjectType type, Map<String, String[]> attributes) throws IdentityException { + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodIn( + log, + Level.FINER, + "createIdentityObject", + new Object[]{ + "name", name, + "IdentityObjectType", type, + "attributes", attributes + }); + } + + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodIn( + log, + Level.FINER, + "", + new Object[]{ + + }); + } + if (name == null) { throw new IdentityException("Name cannot be null"); @@ -336,11 +360,6 @@ checkIOType(type); - if (log.isLoggable(Level.FINER)) - { - log.finer(toString() + ".createIdentityObject with name: " + name + " and type: " + type.getName()); - } - LdapContext ldapContext = getLDAPContext(invocationCtx); String dn = null; @@ -446,15 +465,32 @@ } } - return new SimpleIdentityObject(name, dn, type); + IdentityObject result = new SimpleIdentityObject(name, dn, type); + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "createIdentityObject", + result); + } + + return result; + } public void removeIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObject identity) throws IdentityException { if (log.isLoggable(Level.FINER)) { - log.finer(toString() + ".removeIdentityObject: " + identity); + Tools.logMethodIn( + log, + Level.FINER, + "removeIdentityObject", + new Object[]{ + "IdentityObject", identity + }); } LDAPIdentityObjectImpl ldapIdentity = getSafeLDAPIO(invocationCtx, identity); @@ -510,7 +546,13 @@ { if (log.isLoggable(Level.FINER)) { - log.finer(toString() + ".getIdentityObjectsCount for type: " + identityType); + Tools.logMethodIn( + log, + Level.FINER, + "getIdentityObjectsCount", + new Object[]{ + "IdentityObjectType", identityType + }); } checkIOType(identityType); @@ -543,8 +585,19 @@ scope, null); - return sr.size(); + int result = sr.size(); + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "getIdentityObjectsCount", + result); + } + + return result; + } catch (NoSuchElementException e) { @@ -558,15 +611,34 @@ } throw new IdentityException("User search failed.", e); } + + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "getIdentityObjectsCount", + 0); + } + return 0; } - public IdentityObject findIdentityObject(IdentityStoreInvocationContext invocationCtx, String name, IdentityObjectType type) throws IdentityException + public IdentityObject findIdentityObject(IdentityStoreInvocationContext invocationCtx, + String name, + IdentityObjectType type) throws IdentityException { if (log.isLoggable(Level.FINER)) { - log.finer(toString() + ".findIdentityObject with name: " + name + "; and type: " + type); + Tools.logMethodIn( + log, + Level.FINER, + "findIdentityObject", + new Object[]{ + "name", name, + "IdentityObjectType", type + }); } Context ctx = null; @@ -633,6 +705,15 @@ io = null; } + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "findIdentityObject", + io); + } + return io; } @@ -669,6 +750,15 @@ } } + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "findIdentityObject", + null); + } + return null; } @@ -676,7 +766,13 @@ { if (log.isLoggable(Level.FINER)) { - log.finer(toString() + ".findIdentityObject with id: " + id); + Tools.logMethodIn( + log, + Level.FINER, + "findIdentityObject", + new Object[]{ + "id", id + }); } LdapContext ldapContext = getLDAPContext(ctx); @@ -750,8 +846,19 @@ throw new IdentityException("Can't find identity entry with DN: " + dn); } - return createIdentityObjectInstance(ctx, type, attrs, dn); + IdentityObject result = createIdentityObjectInstance(ctx, type, attrs, dn); + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "findIdentityObject", + result); + } + + return result; + } catch (NoSuchElementException e) { @@ -782,6 +889,16 @@ throw new IdentityException("Failed to close LDAP connection", e); } } + + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "findIdentityObject", + null); + } + return null; } @@ -792,6 +909,17 @@ //TODO: page control with LDAP request control + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodIn( + log, + Level.FINER, + "findIdentityObject", + new Object[]{ + "IdentityObjectType", type, + "IdentityObjectSearchCriteria", criteria + }); + } String nameFilter = "*"; @@ -957,6 +1085,15 @@ objects = (LinkedList)cutPageFromResults(objects, criteria); } + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "findIdentityObject", + objects); + } + return objects; } @@ -973,7 +1110,21 @@ boolean parent, IdentityObjectSearchCriteria criteria) throws IdentityException { + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodIn( + log, + Level.FINER, + "findIdentityObject", + new Object[]{ + "IdentityObject", identity, + "IdentityObjectRelationshipType", relationshipType, + "parent", parent, + "IdentityObjectSearchCriteria", criteria + }); + } + if (relationshipType != null && !relationshipType.getName().equals(MEMBERSHIP_TYPE)) { throw new IdentityException("This store implementation supports only '" + MEMBERSHIP_TYPE +"' relationship type"); @@ -1150,6 +1301,15 @@ sortByName(objects, criteria.isAscending()); } + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "findIdentityObject", + objects); + } + return objects; } @@ -1161,6 +1321,20 @@ throws IdentityException, NamingException { + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodIn( + log, + Level.FINER, + "findRelatedIdentityObjects", + new Object[]{ + "IdentityObject", identity, + "LDAPIdentityObjectImpl", ldapIO, + "IdentityObjectSearchCriteria", criteria, + "parents", parents + }); + } + List<IdentityObject> objects = new LinkedList<IdentityObject>(); LDAPIdentityObjectTypeConfiguration typeConfiguration = getTypeConfiguration(ctx, identity.getIdentityType()); @@ -1324,6 +1498,15 @@ } } + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "findRelatedIdentityObjects", + objects); + } + return objects; } @@ -1335,6 +1518,21 @@ String name) throws IdentityException { + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodIn( + log, + Level.FINER, + "resolveRelationships", + new Object[]{ + "IdentityObject", identity, + "IdentityObjectRelationshipType", type, + "parent", parent, + "named", named, + "name", name + }); + } + if (type == null || !type.getName().equals(MEMBERSHIP_TYPE)) { throw new IdentityException("This store implementation supports only '" + MEMBERSHIP_TYPE +"' relationship type"); @@ -1477,6 +1675,14 @@ } } + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "resolveRelationships", + relationships); + } return relationships; } @@ -1500,6 +1706,19 @@ throws IdentityException, NamingException { + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodIn( + log, + Level.FINER, + "findRelationships", + new Object[]{ + "IdentityObject", identity, + "LDAPIdentityObjectImpl", ldapIO, + "parents", parents + }); + } + Set<LDAPIdentityObjectRelationshipImpl> relationships = new HashSet<LDAPIdentityObjectRelationshipImpl>(); LDAPIdentityObjectTypeConfiguration typeConfiguration = getTypeConfiguration(ctx, identity.getIdentityType()); @@ -1631,6 +1850,15 @@ } } + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "findRelationships", + relationships); + } + return relationships; } @@ -1642,20 +1870,29 @@ return findIdentityObject(ctx, identity, relationshipType, parent, null); } - public IdentityObjectRelationship createRelationship(IdentityStoreInvocationContext ctx, IdentityObject fromIdentity, IdentityObject toIdentity, - IdentityObjectRelationshipType relationshipType, - String name, boolean createNames) throws IdentityException + public IdentityObjectRelationship createRelationship(IdentityStoreInvocationContext ctx, + IdentityObject fromIdentity, + IdentityObject toIdentity, + IdentityObjectRelationshipType relationshipType, + String name, + boolean createNames) throws IdentityException { //TODO: relationshipType is ignored for now if (log.isLoggable(Level.FINER)) { - log.finer(toString() + ".createRelationship with " - + "fromIdentity: " + fromIdentity - + "; toIdentity: " + toIdentity - + "; relationshipType: " + relationshipType - ); + Tools.logMethodIn( + log, + Level.FINER, + "createRelationship", + new Object[]{ + "fromIdentity", fromIdentity, + "toIdentity", toIdentity, + "IdentityObjectRelationshipType", relationshipType, + "name", name, + "createNames", createNames + }); } if (relationshipType == null || !relationshipType.getName().equals(MEMBERSHIP_TYPE)) @@ -1761,21 +1998,38 @@ } } + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "createRelationship", + relationship); + } return relationship; } - public void removeRelationship(IdentityStoreInvocationContext ctx, IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType, String name) throws IdentityException + public void removeRelationship(IdentityStoreInvocationContext ctx, + IdentityObject fromIdentity, + IdentityObject toIdentity, + IdentityObjectRelationshipType relationshipType, + String name) throws IdentityException { // relationshipType is ignored for now if (log.isLoggable(Level.FINER)) { - log.finer(toString() + ".removeRelationship with " - + "fromIdentity: " + fromIdentity - + "; toIdentity: " + toIdentity - + "; relationshipType: " + relationshipType - ); + Tools.logMethodIn( + log, + Level.FINER, + "removeRelationship", + new Object[]{ + "fromIdentity", fromIdentity, + "toIdentity", toIdentity, + "IdentityObjectRelationshipType", relationshipType, + "name", name + }); } LDAPIdentityObjectImpl ldapFromIO = getSafeLDAPIO(ctx, fromIdentity); @@ -1880,14 +2134,22 @@ } } - public void removeRelationships(IdentityStoreInvocationContext ctx, IdentityObject identity1, IdentityObject identity2, boolean named) throws IdentityException + public void removeRelationships(IdentityStoreInvocationContext ctx, + IdentityObject identity1, + IdentityObject identity2, + boolean named) throws IdentityException { if (log.isLoggable(Level.FINER)) { - log.finer(toString() + ".removeRelationships with " - + "identity1: " + identity1 - + "; identity2: " + identity2 - ); + Tools.logMethodIn( + log, + Level.FINER, + "removeRelationships", + new Object[]{ + "identity1", identity1, + "identity2", identity2, + "named", named + }); } @@ -1907,10 +2169,15 @@ if (log.isLoggable(Level.FINER)) { - log.finer(toString() + ".resolveRelationships with " - + "fromIdentity: " + fromIdentity - + "; toIdentity: " + toIdentity - ); + Tools.logMethodIn( + log, + Level.FINER, + "resolveRelationships", + new Object[]{ + "fromIdentity", fromIdentity, + "toIdentity", toIdentity, + "IdentityObjectRelationshipType", relationshipType + }); } if (relationshipType != null && !relationshipType.getName().equals(MEMBERSHIP_TYPE)) @@ -2015,6 +2282,16 @@ throw new IdentityException("Failed to close LDAP connection", e); } } + + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "resolveRelationships", + relationships); + } + return relationships; } @@ -2399,8 +2676,22 @@ } - public boolean validateCredential(IdentityStoreInvocationContext ctx, IdentityObject identityObject, IdentityObjectCredential credential) throws IdentityException + public boolean validateCredential(IdentityStoreInvocationContext ctx, + IdentityObject identityObject, + IdentityObjectCredential credential) throws IdentityException { + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodIn( + log, + Level.FINER, + "validateCredential", + new Object[]{ + "IdentityObject", identityObject, + "IdentityObjectCredential", "****" + }); + } + if (credential == null) { throw new IllegalArgumentException(); @@ -2421,6 +2712,16 @@ passwordString = credential.getValue().toString(); if (passwordString.length() == 0 && !getTypeConfiguration(ctx, identityObject.getIdentityType()).isAllowEmptyPassword()) { + + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "validateCredential", + false); + } + return false; } } @@ -2451,6 +2752,16 @@ if (initialCtx != null) { initialCtx.close(); + + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "validateCredential", + true); + } + return true; } @@ -2475,6 +2786,15 @@ throw new IdentityException("Failed to close LDAP connection", e); } } + + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "validateCredential", + false); + } return false; @@ -2485,8 +2805,22 @@ } } - public void updateCredential(IdentityStoreInvocationContext ctx, IdentityObject identityObject, IdentityObjectCredential credential) throws IdentityException + public void updateCredential(IdentityStoreInvocationContext ctx, + IdentityObject identityObject, + IdentityObjectCredential credential) throws IdentityException { + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodIn( + log, + Level.FINER, + "updateCredential", + new Object[]{ + "IdentityObject", identityObject, + "IdentityObjectCredential", "****" + }); + } + if (credential == null) { throw new IllegalArgumentException(); @@ -2632,40 +2966,84 @@ // Attributes - public Set<String> getSupportedAttributeNames(IdentityStoreInvocationContext invocationContext, IdentityObjectType identityType) throws IdentityException + public Set<String> getSupportedAttributeNames(IdentityStoreInvocationContext invocationContext, + IdentityObjectType identityType) throws IdentityException { if (log.isLoggable(Level.FINER)) { - log.finer(toString() + ".getSupportedAttributeNames with " - + "identityType: " + identityType - ); + Tools.logMethodIn( + log, + Level.FINER, + "getSupportedAttributeNames", + new Object[]{ + "IdentityObjectType", identityType + }); } checkIOType(identityType); - return getTypeConfiguration(invocationContext, identityType).getMappedAttributesNames(); + Set<String> results = getTypeConfiguration(invocationContext, identityType).getMappedAttributesNames(); + + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "getSupportedAttributeNames", + results); + } + + return results; } - public Map<String, IdentityObjectAttributeMetaData> getAttributesMetaData(IdentityStoreInvocationContext invocationContext, IdentityObjectType identityObjectType) + public Map<String, IdentityObjectAttributeMetaData> getAttributesMetaData(IdentityStoreInvocationContext invocationContext, + IdentityObjectType identityObjectType) { - return attributesMetaData.get(identityObjectType.getName()); + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodIn( + log, + Level.FINER, + "getAttributeMetaData", + new Object[]{ + "IdentityObjectType", identityObjectType + }); + } + Map<String, IdentityObjectAttributeMetaData> results = attributesMetaData.get(identityObjectType.getName()); + + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "getAttributesMetaData", + results); + } + + return results; } - public IdentityObjectAttribute getAttribute(IdentityStoreInvocationContext invocationContext, IdentityObject identity, String name) throws IdentityException + public IdentityObjectAttribute getAttribute(IdentityStoreInvocationContext invocationContext, + IdentityObject identity, String name) throws IdentityException { //TODO: dummy temporary implementation return getAttributes(invocationContext, identity).get(name); } - public Map<String, IdentityObjectAttribute> getAttributes(IdentityStoreInvocationContext ctx, IdentityObject identity) throws IdentityException + public Map<String, IdentityObjectAttribute> getAttributes(IdentityStoreInvocationContext ctx, + IdentityObject identity) throws IdentityException { if (log.isLoggable(Level.FINER)) { - log.finer(toString() + ".getAttributes with " - + "identity: " + identity - ); + Tools.logMethodIn( + log, + Level.FINER, + "getAttributes", + new Object[]{ + "IdentityObject", identity + }); } // Cache @@ -2759,19 +3137,34 @@ getCache().putIdentityObjectAttributes(getNamespace(), identity, attrsMap); } + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "getAttributes", + attrsMap); + } + return attrsMap; } - public void updateAttributes(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectAttribute[] attributes) throws IdentityException + public void updateAttributes(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectAttribute[] attributes) throws IdentityException { if (log.isLoggable(Level.FINER)) { - log.finer(toString() + ".updateAttributes with " - + "identity: " + identity - + "attributes: " + attributes - ); + Tools.logMethodIn( + log, + Level.FINER, + "updateAttributes", + new Object[]{ + "IdentityObject", identity, + "IdentityObjectAttribute[]", attributes + }); } if (getCache() != null) @@ -2900,15 +3293,21 @@ } - public void addAttributes(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectAttribute[] attributes) throws IdentityException + public void addAttributes(IdentityStoreInvocationContext ctx, + IdentityObject identity, + IdentityObjectAttribute[] attributes) throws IdentityException { if (log.isLoggable(Level.FINER)) { - log.finer(toString() + ".addAttributes with " - + "identity: " + identity - + "attributes: " + attributes - ); + Tools.logMethodIn( + log, + Level.FINER, + "addAttributes", + new Object[]{ + "IdentityObject", identity, + "IdentityObjectAttribute[]", attributes + }); } if (getCache() != null) @@ -3037,15 +3436,21 @@ } } - public void removeAttributes(IdentityStoreInvocationContext ctx, IdentityObject identity, String[] attributeNames) throws IdentityException + public void removeAttributes(IdentityStoreInvocationContext ctx, + IdentityObject identity, + String[] attributeNames) throws IdentityException { if (log.isLoggable(Level.FINER)) { - log.finer(toString() + ".removeAttributes with " - + "identity: " + identity - + "attributeNames: " + attributeNames - ); + Tools.logMethodIn( + log, + Level.FINER, + "removeAttributes", + new Object[]{ + "IdentityObject", identity, + "attributeNames", attributeNames + }); } if (getCache() != null) @@ -3140,8 +3545,24 @@ } } - public IdentityObject findIdentityObjectByUniqueAttribute(IdentityStoreInvocationContext invocationCtx, IdentityObjectType type, IdentityObjectAttribute attribute) throws IdentityException + public IdentityObject findIdentityObjectByUniqueAttribute(IdentityStoreInvocationContext invocationCtx, + IdentityObjectType type, + IdentityObjectAttribute attribute) + throws IdentityException { + + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodIn( + log, + Level.FINER, + "findIdentityObjectByUniqueAttribute", + new Object[]{ + "IdentityObjectType", type, + "IdentityObjectAttribute", attribute + }); + } + String nameFilter = "*"; @@ -3246,6 +3667,15 @@ if (objects.size() == 0) { + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "findIdentityObjectByUniqueAttribute", + null); + } + return null; } if (objects.size() > 1) @@ -3253,6 +3683,14 @@ throw new IdentityException("Illegal state - more than one IdentityObject of same type share same unique attribute value"); } + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "findIdentityObjectByUniqueAttribute", + objects.get(0)); + } return objects.get(0); } @@ -3460,6 +3898,15 @@ } } + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodOut( + log, + Level.FINER, + "searchIdentityObjects", + finalResults); + } + return finalResults; } @@ -3482,6 +3929,20 @@ Control[] requestControls) throws NamingException { + if (log.isLoggable(Level.FINER)) + { + Tools.logMethodIn( + log, + Level.FINER, + "searchLDAP", + new Object[]{ + "jndiName", jndiName, + "filterArgs", filterArgs, + "SearchControls", searchControls, + "requestControls", requestControls + }); + } + // Add paged controls if needed int pageSize = configuration.getPagedExtensionSize();

14 years

1
0
0 / 0

Picketlink SVN: r562 - in federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2: protocol and 1 other directory.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2010-11-24 18:56:13 -0500 (Wed, 24 Nov 2010) New Revision: 562 Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResolveType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResponseType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AssertionIDRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AttributeQueryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnContextComparisonType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnQueryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthzDecisionQueryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ExtensionsType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPEntryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPListType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/LogoutRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ManageNameIDRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingResponseType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDPolicyType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestAbstractType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestedAuthnContextType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ResponseType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ScopingType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusCodeType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusDetailType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusResponseType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/SubjectQueryAbstractType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/TerminateType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/package-info.java Log: the saml protocol classes Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResolveType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResolveType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResolveType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,74 @@ +/* + * 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.newmodel.saml.v2.protocol; + + + +/** + * Java class for ArtifactResolveType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ArtifactResolveType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Artifact"/> + * </sequence> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class ArtifactResolveType +extends RequestAbstractType +{ + protected String artifact; + + /** + * Gets the value of the artifact property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArtifact() { + return artifact; + } + + /** + * Sets the value of the artifact property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArtifact(String value) { + this.artifact = value; + } + +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResponseType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResponseType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResponseType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,79 @@ +/* + * 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.newmodel.saml.v2.protocol; + + +import org.w3c.dom.Element; + + +/** + * Java class for ArtifactResponseType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ArtifactResponseType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType"> + * <sequence> + * <any/> + * </sequence> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class ArtifactResponseType + extends StatusResponseType +{ + + protected Object any; + + /** + * Gets the value of the any property. + * + * @return + * possible object is + * {@link Element } + * {@link Object } + * + */ + public Object getAny() { + return any; + } + + /** + * Sets the value of the any property. + * + * @param value + * allowed object is + * {@link Element } + * {@link Object } + * + */ + public void setAny(Object value) { + this.any = value; + } + +} Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AssertionIDRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AssertionIDRequestType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AssertionIDRequestType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,66 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for AssertionIDRequestType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AssertionIDRequestType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef" maxOccurs="unbounded"/> + * </sequence> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class AssertionIDRequestType +extends RequestAbstractType +{ + protected List<String> assertionIDRef = new ArrayList<String>(); + + public void addAssertionIDRef( String id ) + { + assertionIDRef.add( id ); + } + + /** + * Gets the value of the assertionIDRef property. + * + */ + public List<String> getAssertionIDRef() + { + return Collections.unmodifiableList( this.assertionIDRef ); + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AttributeQueryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AttributeQueryType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AttributeQueryType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,68 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType; + + + +/** + * Java class for AttributeQueryType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AttributeQueryType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}SubjectQueryAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class AttributeQueryType +extends SubjectQueryAbstractType +{ + protected List<AttributeType> attribute = new ArrayList<AttributeType>(); + + public void add( AttributeType att ) + { + this.attribute.add(att); + } + + /** + * Gets the value of the attribute property. + */ + public List<AttributeType> getAttribute() + { + return Collections.unmodifiableList( this.attribute ); + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnContextComparisonType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnContextComparisonType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnContextComparisonType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -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.newmodel.saml.v2.protocol; + + +/** + * Java class for AuthnContextComparisonType. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <simpleType name="AuthnContextComparisonType"> + * <restriction base="{http://www.w3.org/2001/XMLSchema}string"> + * <enumeration value="exact"/> + * <enumeration value="minimum"/> + * <enumeration value="maximum"/> + * <enumeration value="better"/> + * </restriction> + * </simpleType> + * </pre> + * + */ +public enum AuthnContextComparisonType +{ + EXACT("exact"), + MINIMUM("minimum"), + MAXIMUM("maximum"), + BETTER("better"); + + private final String value; + + AuthnContextComparisonType(String v) + { + value = v; + } + + public String value() + { + return value; + } + + public static AuthnContextComparisonType fromValue(String v) + { + for (AuthnContextComparisonType c: AuthnContextComparisonType.values()) + { + if (c.value.equals(v)) + { + return c; + } + } + throw new IllegalArgumentException(v); + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnQueryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnQueryType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnQueryType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,99 @@ +/* + * 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.newmodel.saml.v2.protocol; + + +/** + * Java class for AuthnQueryType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AuthnQueryType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}SubjectQueryAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}RequestedAuthnContext" minOccurs="0"/> + * </sequence> + * <attribute name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class AuthnQueryType +extends SubjectQueryAbstractType +{ + + protected RequestedAuthnContextType requestedAuthnContext; + protected String sessionIndex; + + /** + * Gets the value of the requestedAuthnContext property. + * + * @return + * possible object is + * {@link RequestedAuthnContextType } + * + */ + public RequestedAuthnContextType getRequestedAuthnContext() { + return requestedAuthnContext; + } + + /** + * Sets the value of the requestedAuthnContext property. + * + * @param value + * allowed object is + * {@link RequestedAuthnContextType } + * + */ + public void setRequestedAuthnContext(RequestedAuthnContextType value) { + this.requestedAuthnContext = value; + } + + /** + * Gets the value of the sessionIndex property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSessionIndex() { + return sessionIndex; + } + + /** + * Sets the value of the sessionIndex property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSessionIndex(String value) { + this.sessionIndex = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnRequestType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnRequestType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,365 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.net.URI; + +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType; + + + +/** + * Java class for AuthnRequestType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AuthnRequestType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Subject" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NameIDPolicy" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Conditions" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}RequestedAuthnContext" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Scoping" minOccurs="0"/> + * </sequence> + * <attribute name="ForceAuthn" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * <attribute name="IsPassive" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * <attribute name="ProtocolBinding" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="AssertionConsumerServiceIndex" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" /> + * <attribute name="AssertionConsumerServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="AttributeConsumingServiceIndex" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" /> + * <attribute name="ProviderName" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class AuthnRequestType +extends RequestAbstractType +{ + + protected SubjectType subject; + protected NameIDPolicyType nameIDPolicy; + protected ConditionsType conditions; + protected RequestedAuthnContextType requestedAuthnContext; + protected ScopingType scoping; + protected Boolean forceAuthn; + protected Boolean isPassive; + protected URI protocolBinding; + protected Integer assertionConsumerServiceIndex; + protected URI assertionConsumerServiceURL; + protected Integer attributeConsumingServiceIndex; + protected String providerName; + + /** + * Gets the value of the subject property. + * + * @return + * possible object is + * {@link SubjectType } + * + */ + public SubjectType getSubject() { + return subject; + } + + /** + * Sets the value of the subject property. + * + * @param value + * allowed object is + * {@link SubjectType } + * + */ + public void setSubject(SubjectType value) { + this.subject = value; + } + + /** + * Gets the value of the nameIDPolicy property. + * + * @return + * possible object is + * {@link NameIDPolicyType } + * + */ + public NameIDPolicyType getNameIDPolicy() { + return nameIDPolicy; + } + + /** + * Sets the value of the nameIDPolicy property. + * + * @param value + * allowed object is + * {@link NameIDPolicyType } + * + */ + public void setNameIDPolicy(NameIDPolicyType value) { + this.nameIDPolicy = value; + } + + /** + * Gets the value of the conditions property. + * + * @return + * possible object is + * {@link ConditionsType } + * + */ + public ConditionsType getConditions() { + return conditions; + } + + /** + * Sets the value of the conditions property. + * + * @param value + * allowed object is + * {@link ConditionsType } + * + */ + public void setConditions(ConditionsType value) { + this.conditions = value; + } + + /** + * Gets the value of the requestedAuthnContext property. + * + * @return + * possible object is + * {@link RequestedAuthnContextType } + * + */ + public RequestedAuthnContextType getRequestedAuthnContext() { + return requestedAuthnContext; + } + + /** + * Sets the value of the requestedAuthnContext property. + * + * @param value + * allowed object is + * {@link RequestedAuthnContextType } + * + */ + public void setRequestedAuthnContext(RequestedAuthnContextType value) { + this.requestedAuthnContext = value; + } + + /** + * Gets the value of the scoping property. + * + * @return + * possible object is + * {@link ScopingType } + * + */ + public ScopingType getScoping() { + return scoping; + } + + /** + * Sets the value of the scoping property. + * + * @param value + * allowed object is + * {@link ScopingType } + * + */ + public void setScoping(ScopingType value) { + this.scoping = value; + } + + /** + * Gets the value of the forceAuthn property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isForceAuthn() { + return forceAuthn; + } + + /** + * Sets the value of the forceAuthn property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setForceAuthn(Boolean value) { + this.forceAuthn = value; + } + + /** + * Gets the value of the isPassive property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isIsPassive() { + return isPassive; + } + + /** + * Sets the value of the isPassive property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setIsPassive(Boolean value) { + this.isPassive = value; + } + + /** + * Gets the value of the protocolBinding property. + * + * @return + * possible object is + * {@link String } + * + */ + public URI getProtocolBinding() { + return protocolBinding; + } + + /** + * Sets the value of the protocolBinding property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setProtocolBinding( URI value) { + this.protocolBinding = value; + } + + /** + * Gets the value of the assertionConsumerServiceIndex property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getAssertionConsumerServiceIndex() { + return assertionConsumerServiceIndex; + } + + /** + * Sets the value of the assertionConsumerServiceIndex property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setAssertionConsumerServiceIndex(Integer value) { + this.assertionConsumerServiceIndex = value; + } + + /** + * Gets the value of the assertionConsumerServiceURL property. + * + * @return + * possible object is + * {@link String } + * + */ + public URI getAssertionConsumerServiceURL() { + return assertionConsumerServiceURL; + } + + /** + * Sets the value of the assertionConsumerServiceURL property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAssertionConsumerServiceURL( URI value) { + this.assertionConsumerServiceURL = value; + } + + /** + * Gets the value of the attributeConsumingServiceIndex property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getAttributeConsumingServiceIndex() { + return attributeConsumingServiceIndex; + } + + /** + * Sets the value of the attributeConsumingServiceIndex property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setAttributeConsumingServiceIndex(Integer value) { + this.attributeConsumingServiceIndex = value; + } + + /** + * Gets the value of the providerName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getProviderName() { + return providerName; + } + + /** + * Sets the value of the providerName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setProviderName(String value) { + this.providerName = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthzDecisionQueryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthzDecisionQueryType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthzDecisionQueryType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,123 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ActionType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EvidenceType; + + +/** + * Java class for AuthzDecisionQueryType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AuthzDecisionQueryType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}SubjectQueryAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Action" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Evidence" minOccurs="0"/> + * </sequence> + * <attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </extension> + * </complexContent> + * </complexType> + * </pre> + */ +public class AuthzDecisionQueryType +extends SubjectQueryAbstractType +{ + protected List<ActionType> action = new ArrayList<ActionType> (); + protected EvidenceType evidence; + protected URI resource; + + public void addAction( ActionType act ) + { + this.action.add(act); + } + + /** + * Gets the value of the action property. + */ + public List<ActionType> getAction() + { + return Collections.unmodifiableList( this.action ); + } + + /** + * Gets the value of the evidence property. + * + * @return + * possible object is + * {@link EvidenceType } + * + */ + public EvidenceType getEvidence() + { + return evidence; + } + + /** + * Sets the value of the evidence property. + * + * @param value + * allowed object is + * {@link EvidenceType } + * + */ + public void setEvidence(EvidenceType value) + { + this.evidence = value; + } + + /** + * Gets the value of the resource property. + * + * @return + * possible object is + * {@link String } + * + */ + public URI getResource() + { + return resource; + } + + /** + * Sets the value of the resource property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setResource( URI value) + { + this.resource = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ExtensionsType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ExtensionsType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ExtensionsType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,64 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for ExtensionsType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ExtensionsType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <any/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + */ +public class ExtensionsType +{ + protected List<Object> any = new ArrayList<Object>(); + + public void addExtension( Object extension ) + { + any.add( extension ); + } + + /** + * Gets the value of the any property. + * + */ + public List<Object> getAny() + { + return Collections.unmodifiableList( this.any ); + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPEntryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPEntryType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPEntryType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,126 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.net.URI; + + +/** + * Java class for IDPEntryType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="IDPEntryType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="ProviderID" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="Loc" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class IDPEntryType +{ + protected URI providerID; + protected String name; + protected String loc; + + /** + * Gets the value of the providerID property. + * + * @return + * possible object is + * {@link String } + * + */ + public URI getProviderID() + { + return providerID; + } + + /** + * Sets the value of the providerID property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setProviderID( URI value) + { + this.providerID = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the loc property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLoc() { + return loc; + } + + /** + * Sets the value of the loc property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLoc(String value) { + this.loc = value; + } + +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPListType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPListType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPListType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,93 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for IDPListType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="IDPListType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}IDPEntry" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}GetComplete" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class IDPListType +{ + protected List<IDPEntryType> idpEntry = new ArrayList<IDPEntryType>(); + protected URI getComplete; + + public void addIDPEntry( IDPEntryType entry ) + { + this.idpEntry.add(entry); + } + + /** + * Gets the value of the idpEntry property. + * + */ + public List<IDPEntryType> getIDPEntry() + { + return Collections.unmodifiableList( this.idpEntry ); + } + + /** + * Gets the value of the getComplete property. + * + * @return + * possible object is + * {@link String } + * + */ + public URI getGetComplete() { + return getComplete; + } + + /** + * Sets the value of the getComplete property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setGetComplete( URI value) { + this.getComplete = value; + } + +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/LogoutRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/LogoutRequestType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/LogoutRequestType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,205 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.BaseIDAbstractType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedElementType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType; + + + +/** + * Java class for LogoutRequestType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="LogoutRequestType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/> + * </choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}SessionIndex" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="Reason" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class LogoutRequestType + extends RequestAbstractType +{ + protected BaseIDAbstractType baseID; + protected NameIDType nameID; + protected EncryptedElementType encryptedID; + protected List<String> sessionIndex = new ArrayList<String>(); + protected String reason; + protected XMLGregorianCalendar notOnOrAfter; + + /** + * Gets the value of the baseID property. + * + * @return + * possible object is + * {@link BaseIDAbstractType } + * + */ + public BaseIDAbstractType getBaseID() { + return baseID; + } + + /** + * Sets the value of the baseID property. + * + * @param value + * allowed object is + * {@link BaseIDAbstractType } + * + */ + public void setBaseID(BaseIDAbstractType value) { + this.baseID = value; + } + + /** + * Gets the value of the nameID property. + * + * @return + * possible object is + * {@link NameIDType } + * + */ + public NameIDType getNameID() { + return nameID; + } + + /** + * Sets the value of the nameID property. + * + * @param value + * allowed object is + * {@link NameIDType } + * + */ + public void setNameID(NameIDType value) { + this.nameID = value; + } + + /** + * Gets the value of the encryptedID property. + * + * @return + * possible object is + * {@link EncryptedElementType } + * + */ + public EncryptedElementType getEncryptedID() { + return encryptedID; + } + + /** + * Sets the value of the encryptedID property. + * + * @param value + * allowed object is + * {@link EncryptedElementType } + * + */ + public void setEncryptedID(EncryptedElementType value) { + this.encryptedID = value; + } + + public void addSessionIndex( String index ) + { + this.sessionIndex.add( index ); + } + + /** + * Gets the value of the sessionIndex property. + * + */ + public List<String> getSessionIndex() + { + return Collections.unmodifiableList( this.sessionIndex ); + } + + /** + * Gets the value of the reason property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getReason() { + return reason; + } + + /** + * Sets the value of the reason property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReason(String value) { + this.reason = value; + } + + /** + * Gets the value of the notOnOrAfter property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getNotOnOrAfter() { + return notOnOrAfter; + } + + /** + * Sets the value of the notOnOrAfter property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setNotOnOrAfter(XMLGregorianCalendar value) { + this.notOnOrAfter = value; + } + +} Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ManageNameIDRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ManageNameIDRequestType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ManageNameIDRequestType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,186 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedElementType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType; + + + +/** + * Java class for ManageNameIDRequestType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ManageNameIDRequestType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/> + * </choice> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewEncryptedID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Terminate"/> + * </choice> + * </sequence> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class ManageNameIDRequestType +extends RequestAbstractType +{ + + protected NameIDType nameID; + protected EncryptedElementType encryptedID; + protected String newID; + protected EncryptedElementType newEncryptedID; + protected TerminateType terminate; + + /** + * Gets the value of the nameID property. + * + * @return + * possible object is + * {@link NameIDType } + * + */ + public NameIDType getNameID() { + return nameID; + } + + /** + * Sets the value of the nameID property. + * + * @param value + * allowed object is + * {@link NameIDType } + * + */ + public void setNameID(NameIDType value) { + this.nameID = value; + } + + /** + * Gets the value of the encryptedID property. + * + * @return + * possible object is + * {@link EncryptedElementType } + * + */ + public EncryptedElementType getEncryptedID() { + return encryptedID; + } + + /** + * Sets the value of the encryptedID property. + * + * @param value + * allowed object is + * {@link EncryptedElementType } + * + */ + public void setEncryptedID(EncryptedElementType value) { + this.encryptedID = value; + } + + /** + * Gets the value of the newID property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNewID() { + return newID; + } + + /** + * Sets the value of the newID property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNewID(String value) { + this.newID = value; + } + + /** + * Gets the value of the newEncryptedID property. + * + * @return + * possible object is + * {@link EncryptedElementType } + * + */ + public EncryptedElementType getNewEncryptedID() { + return newEncryptedID; + } + + /** + * Sets the value of the newEncryptedID property. + * + * @param value + * allowed object is + * {@link EncryptedElementType } + * + */ + public void setNewEncryptedID(EncryptedElementType value) { + this.newEncryptedID = value; + } + + /** + * Gets the value of the terminate property. + * + * @return + * possible object is + * {@link TerminateType } + * + */ + public TerminateType getTerminate() { + return terminate; + } + + /** + * Sets the value of the terminate property. + * + * @param value + * allowed object is + * {@link TerminateType } + * + */ + public void setTerminate(TerminateType value) { + this.terminate = value; + } + +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingRequestType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingRequestType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,157 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.BaseIDAbstractType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedElementType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType; + + + +/** + * Java class for NameIDMappingRequestType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="NameIDMappingRequestType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/> + * </choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NameIDPolicy"/> + * </sequence> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class NameIDMappingRequestType +extends RequestAbstractType +{ + protected BaseIDAbstractType baseID; + protected NameIDType nameID; + protected EncryptedElementType encryptedID; + protected NameIDPolicyType nameIDPolicy; + + /** + * Gets the value of the baseID property. + * + * @return + * possible object is + * {@link BaseIDAbstractType } + * + */ + public BaseIDAbstractType getBaseID() { + return baseID; + } + + /** + * Sets the value of the baseID property. + * + * @param value + * allowed object is + * {@link BaseIDAbstractType } + * + */ + public void setBaseID(BaseIDAbstractType value) { + this.baseID = value; + } + + /** + * Gets the value of the nameID property. + * + * @return + * possible object is + * {@link NameIDType } + * + */ + public NameIDType getNameID() { + return nameID; + } + + /** + * Sets the value of the nameID property. + * + * @param value + * allowed object is + * {@link NameIDType } + * + */ + public void setNameID(NameIDType value) { + this.nameID = value; + } + + /** + * Gets the value of the encryptedID property. + * + * @return + * possible object is + * {@link EncryptedElementType } + * + */ + public EncryptedElementType getEncryptedID() { + return encryptedID; + } + + /** + * Sets the value of the encryptedID property. + * + * @param value + * allowed object is + * {@link EncryptedElementType } + * + */ + public void setEncryptedID(EncryptedElementType value) { + this.encryptedID = value; + } + + /** + * Gets the value of the nameIDPolicy property. + * + * @return + * possible object is + * {@link NameIDPolicyType } + * + */ + public NameIDPolicyType getNameIDPolicy() { + return nameIDPolicy; + } + + /** + * Sets the value of the nameIDPolicy property. + * + * @param value + * allowed object is + * {@link NameIDPolicyType } + * + */ + public void setNameIDPolicy(NameIDPolicyType value) { + this.nameIDPolicy = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingResponseType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingResponseType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingResponseType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,100 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedElementType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType; + +/** + * Java class for NameIDMappingResponseType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="NameIDMappingResponseType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType"> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/> + * </choice> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class NameIDMappingResponseType +extends StatusResponseType +{ + protected NameIDType nameID; + protected EncryptedElementType encryptedID; + + /** + * Gets the value of the nameID property. + * + * @return + * possible object is + * {@link NameIDType } + * + */ + public NameIDType getNameID() { + return nameID; + } + + /** + * Sets the value of the nameID property. + * + * @param value + * allowed object is + * {@link NameIDType } + * + */ + public void setNameID(NameIDType value) { + this.nameID = value; + } + + /** + * Gets the value of the encryptedID property. + * + * @return + * possible object is + * {@link EncryptedElementType } + * + */ + public EncryptedElementType getEncryptedID() { + return encryptedID; + } + + /** + * Sets the value of the encryptedID property. + * + * @param value + * allowed object is + * {@link EncryptedElementType } + * + */ + public void setEncryptedID(EncryptedElementType value) { + this.encryptedID = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDPolicyType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDPolicyType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDPolicyType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,123 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.net.URI; + + +/** + * Java class for NameIDPolicyType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="NameIDPolicyType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="Format" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="SPNameQualifier" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="AllowCreate" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class NameIDPolicyType +{ + protected URI format; + protected String spNameQualifier; + protected Boolean allowCreate; + + /** + * Gets the value of the format property. + * + * @return + * possible object is + * {@link String } + * + */ + public URI getFormat() { + return format; + } + + /** + * Sets the value of the format property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFormat( URI value) { + this.format = value; + } + + /** + * Gets the value of the spNameQualifier property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSPNameQualifier() { + return spNameQualifier; + } + + /** + * Sets the value of the spNameQualifier property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSPNameQualifier(String value) { + this.spNameQualifier = value; + } + + /** + * Gets the value of the allowCreate property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isAllowCreate() { + return allowCreate; + } + + /** + * Sets the value of the allowCreate property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setAllowCreate(Boolean value) { + this.allowCreate = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestAbstractType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestAbstractType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestAbstractType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,265 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.net.URI; + +import javax.xml.datatype.XMLGregorianCalendar; + +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType; +import org.picketlink.identity.federation.saml.v2.SAML2Object; +import org.picketlink.identity.xmlsec.w3.xmldsig.SignatureType; +import org.w3c.dom.Element; + + +/** + * Java class for RequestAbstractType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="RequestAbstractType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Issuer" minOccurs="0"/> + * <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Extensions" minOccurs="0"/> + * </sequence> + * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * <attribute name="Version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="Destination" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="Consent" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public abstract class RequestAbstractType implements SAML2Object +{ + protected String id; + + protected NameIDType issuer; + protected Element signature; + protected ExtensionsType extensions; + protected String version; + protected XMLGregorianCalendar issueInstant; + protected URI destination; + protected String consent; + + /** + * Gets the value of the issuer property. + * + * @return + * possible object is + * {@link NameIDType } + * + */ + public NameIDType getIssuer() { + return issuer; + } + + /** + * Sets the value of the issuer property. + * + * @param value + * allowed object is + * {@link NameIDType } + * + */ + public void setIssuer(NameIDType value) { + this.issuer = value; + } + + /** + * Gets the value of the signature property. + * + * @return + * possible object is + * {@link SignatureType } + * + */ + public Element getSignature() { + return signature; + } + + /** + * Sets the value of the signature property. + * + * @param value + * allowed object is + * {@link SignatureType } + * + */ + public void setSignature(Element value) { + this.signature = value; + } + + /** + * Gets the value of the extensions property. + * + * @return + * possible object is + * {@link ExtensionsType } + * + */ + public ExtensionsType getExtensions() { + return extensions; + } + + /** + * Sets the value of the extensions property. + * + * @param value + * allowed object is + * {@link ExtensionsType } + * + */ + public void setExtensions(ExtensionsType value) { + this.extensions = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the version property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersion() { + return version; + } + + /** + * Sets the value of the version property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersion(String value) { + this.version = value; + } + + /** + * Gets the value of the issueInstant property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getIssueInstant() { + return issueInstant; + } + + /** + * Sets the value of the issueInstant property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setIssueInstant(XMLGregorianCalendar value) { + this.issueInstant = value; + } + + /** + * Gets the value of the destination property. + * + * @return + * possible object is + * {@link String } + * + */ + public URI getDestination() + { + return destination; + } + + /** + * Sets the value of the destination property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDestination( URI value) { + this.destination = value; + } + + /** + * Gets the value of the consent property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getConsent() { + return consent; + } + + /** + * Sets the value of the consent property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setConsent(String value) { + this.consent = value; + } + +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestedAuthnContextType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestedAuthnContextType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestedAuthnContextType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,126 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * Java class for RequestedAuthnContextType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="RequestedAuthnContextType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextClassRef" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef" maxOccurs="unbounded"/> + * </choice> + * <attribute name="Comparison" type="{urn:oasis:names:tc:SAML:2.0:protocol}AuthnContextComparisonType" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class RequestedAuthnContextType +{ + protected List<String> authnContextClassRef = new ArrayList<String>(); + protected List<String> authnContextDeclRef = new ArrayList<String>(); + protected AuthnContextComparisonType comparison; + + public void addAuthnContextClassRef( String str ) + { + this.authnContextClassRef.add(str); + } + + public void addAuthnContextDeclRef( String str ) + { + this.authnContextDeclRef.add(str); + } + + /** + * Gets the value of the authnContextClassRef property. + * + */ + public List<String> getAuthnContextClassRef() + { + return Collections.unmodifiableList( this.authnContextClassRef ); + } + + /** + * Gets the value of the authnContextDeclRef property. + * + * + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the authnContextDeclRef property. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getAuthnContextDeclRef().add(newItem); + * </pre> + * + * + * + * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List<String> getAuthnContextDeclRef() + { + return Collections.unmodifiableList( this.authnContextDeclRef ); + } + + /** + * Gets the value of the comparison property. + * + * @return + * possible object is + * {@link AuthnContextComparisonType } + * + */ + public AuthnContextComparisonType getComparison() + { + return comparison; + } + + /** + * Sets the value of the comparison property. + * + * @param value + * allowed object is + * {@link AuthnContextComparisonType } + * + */ + public void setComparison(AuthnContextComparisonType value) + { + this.comparison = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ResponseType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ResponseType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ResponseType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,90 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedAssertionType; +import org.picketlink.identity.federation.saml.v2.assertion.AssertionType; + +/** + * Java class for ResponseType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ResponseType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType"> + * <choice maxOccurs="unbounded" minOccurs="0"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/> + * </choice> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class ResponseType +extends StatusResponseType +{ + protected List<ChoiceType> assertions = new ArrayList<ResponseType.ChoiceType>(); + + public void addAssertion( ChoiceType choice ) + { + assertions.add(choice); + } + + /** + * Gets a read only list of assertions + */ + public List<ChoiceType> getAssertions() + { + return Collections.unmodifiableList( assertions ); + } + + public static class ChoiceType + { + private AssertionType assertion; + private EncryptedAssertionType encryptedAssertion; + public ChoiceType(AssertionType assertion) + { + this.assertion = assertion; + } + public ChoiceType(EncryptedAssertionType encryptedAssertion) + { + this.encryptedAssertion = encryptedAssertion; + } + public AssertionType getAssertion() + { + return assertion; + } + public EncryptedAssertionType getEncryptedAssertion() + { + return encryptedAssertion; + } + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ScopingType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ScopingType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ScopingType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,139 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.math.BigInteger; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for ScopingType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ScopingType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}IDPList" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}RequesterID" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="ProxyCount" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class ScopingType +{ + protected IDPListType idpList; + protected List<URI> requesterID = new ArrayList<URI>(); + + protected BigInteger proxyCount; + + /** + * Gets the value of the idpList property. + * + * @return + * possible object is + * {@link IDPListType } + * + */ + public IDPListType getIDPList() { + return idpList; + } + + /** + * Sets the value of the idpList property. + * + * @param value + * allowed object is + * {@link IDPListType } + * + */ + public void setIDPList(IDPListType value) { + this.idpList = value; + } + + /** + * Gets the value of the requesterID property. + * + * + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the requesterID property. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getRequesterID().add(newItem); + * </pre> + * + * + * + * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List<URI> getRequesterID() + { + return Collections.unmodifiableList( this.requesterID ); + } + + public void addRequesterID( URI uri ) + { + this.requesterID.add( uri ); + } + + /** + * Gets the value of the proxyCount property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getProxyCount() { + return proxyCount; + } + + /** + * Sets the value of the proxyCount property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setProxyCount(BigInteger value) { + this.proxyCount = value; + } + +} Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusCodeType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusCodeType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusCodeType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,101 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.net.URI; + + + +/** + * Java class for StatusCodeType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="StatusCodeType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusCode" minOccurs="0"/> + * </sequence> + * <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class StatusCodeType +{ + protected StatusCodeType statusCode; + protected URI value; + + /** + * Gets the value of the statusCode property. + * + * @return + * possible object is + * {@link StatusCodeType } + * + */ + public StatusCodeType getStatusCode() { + return statusCode; + } + + /** + * Sets the value of the statusCode property. + * + * @param value + * allowed object is + * {@link StatusCodeType } + * + */ + public void setStatusCode(StatusCodeType value) { + this.statusCode = value; + } + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public URI getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue( URI value ) + { + this.value = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusDetailType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusDetailType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusDetailType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,64 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for StatusDetailType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="StatusDetailType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <any/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class StatusDetailType +{ + protected List<Object> any = new ArrayList<Object>(); + + public void addStatusDetail( Object obj ) + { + this.any.add( obj ); + } + + /** + * Gets the value of the any property. + */ + public List<Object> getAny() + { + return Collections.unmodifiableList( this.any ); + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusResponseType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusResponseType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusResponseType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,312 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import javax.xml.datatype.XMLGregorianCalendar; + +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType; +import org.picketlink.identity.federation.saml.v2.SAML2Object; +import org.w3c.dom.Element; + + +/** + * Java class for StatusResponseType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="StatusResponseType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Issuer" minOccurs="0"/> + * <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Extensions" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Status"/> + * </sequence> + * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * <attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" /> + * <attribute name="Version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="Destination" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="Consent" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class StatusResponseType implements SAML2Object +{ + protected NameIDType issuer; + protected Element signature; + protected ExtensionsType extensions; + protected StatusType status; + protected String id; + protected String inResponseTo; + protected String version; + protected XMLGregorianCalendar issueInstant; + protected String destination; + protected String consent; + + /** + * Gets the value of the issuer property. + * + * @return + * possible object is + * {@link NameIDType } + * + */ + public NameIDType getIssuer() { + return issuer; + } + + /** + * Sets the value of the issuer property. + * + * @param value + * allowed object is + * {@link NameIDType } + * + */ + public void setIssuer(NameIDType value) { + this.issuer = value; + } + + /** + * Gets the value of the signature property. + * + * @return + * possible object is + * {@link SignatureType } + * + */ + public Element getSignature() { + return signature; + } + + /** + * Sets the value of the signature property. + * + * @param value + * allowed object is + * {@link SignatureType } + * + */ + public void setSignature( Element value) { + this.signature = value; + } + + /** + * Gets the value of the extensions property. + * + * @return + * possible object is + * {@link ExtensionsType } + * + */ + public ExtensionsType getExtensions() { + return extensions; + } + + /** + * Sets the value of the extensions property. + * + * @param value + * allowed object is + * {@link ExtensionsType } + * + */ + public void setExtensions(ExtensionsType value) { + this.extensions = value; + } + + /** + * Gets the value of the status property. + * + * @return + * possible object is + * {@link StatusType } + * + */ + public StatusType getStatus() { + return status; + } + + /** + * Sets the value of the status property. + * + * @param value + * allowed object is + * {@link StatusType } + * + */ + public void setStatus(StatusType value) { + this.status = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the inResponseTo property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getInResponseTo() { + return inResponseTo; + } + + /** + * Sets the value of the inResponseTo property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setInResponseTo(String value) { + this.inResponseTo = value; + } + + /** + * Gets the value of the version property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersion() { + return version; + } + + /** + * Sets the value of the version property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersion(String value) { + this.version = value; + } + + /** + * Gets the value of the issueInstant property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getIssueInstant() { + return issueInstant; + } + + /** + * Sets the value of the issueInstant property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setIssueInstant(XMLGregorianCalendar value) { + this.issueInstant = value; + } + + /** + * Gets the value of the destination property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDestination() { + return destination; + } + + /** + * Sets the value of the destination property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDestination(String value) { + this.destination = value; + } + + /** + * Gets the value of the consent property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getConsent() { + return consent; + } + + /** + * Sets the value of the consent property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setConsent(String value) { + this.consent = value; + } + +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,125 @@ +/* + * 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.newmodel.saml.v2.protocol; + + + +/** + * Java class for StatusType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="StatusType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusCode"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusMessage" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusDetail" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class StatusType +{ + protected String statusMessage; + protected StatusCodeType statusCode; + protected StatusDetailType statusDetail; + + /** + * Gets the value of the statusCode property. + * + * @return + * possible object is + * {@link StatusCodeType } + * + */ + public StatusCodeType getStatusCode() { + return statusCode; + } + + /** + * Sets the value of the statusCode property. + * + * @param value + * allowed object is + * {@link StatusCodeType } + * + */ + public void setStatusCode(StatusCodeType value) { + this.statusCode = value; + } + + /** + * Gets the value of the statusMessage property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getStatusMessage() { + return statusMessage; + } + + /** + * Sets the value of the statusMessage property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStatusMessage(String value) { + this.statusMessage = value; + } + + /** + * Gets the value of the statusDetail property. + * + * @return + * possible object is + * {@link StatusDetailType } + * + */ + public StatusDetailType getStatusDetail() { + return statusDetail; + } + + /** + * Sets the value of the statusDetail property. + * + * @param value + * allowed object is + * {@link StatusDetailType } + * + */ + public void setStatusDetail(StatusDetailType value) { + this.statusDetail = value; + } + +} Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/SubjectQueryAbstractType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/SubjectQueryAbstractType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/SubjectQueryAbstractType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,70 @@ +/* + * 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.newmodel.saml.v2.protocol; + +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType; + + +/** + * Java class for SubjectQueryAbstractType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="SubjectQueryAbstractType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Subject"/> + * </sequence> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public abstract class SubjectQueryAbstractType +extends RequestAbstractType +{ + protected SubjectType subject; + + public void setSubject(SubjectType subject) + { + this.subject = subject; + } + + + + /** + * Gets the value of the subject property. + * + * @return + * possible object is + * {@link SubjectType } + * + */ + public SubjectType getSubject() + { + return subject; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/TerminateType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/TerminateType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/TerminateType.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,42 @@ +/* + * 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.newmodel.saml.v2.protocol; + +/** + * Java class for TerminateType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="TerminateType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class TerminateType +{ +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/package-info.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/package-info.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/package-info.java 2010-11-24 23:56:13 UTC (rev 562) @@ -0,0 +1,4 @@ +/** + * Package containing the classes for the protocol of SAMLv2 + */ +package org.picketlink.identity.federation.newmodel.saml.v2.protocol;

14 years, 1 month

1
0
0 / 0

Picketlink SVN: r561 - in federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation: newmodel and 3 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2010-11-24 17:08:52 -0500 (Wed, 24 Nov 2010) New Revision: 561 Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ActionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AdviceType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AssertionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeStatementType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AudienceRestrictionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextClassRefType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclRefType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnStatementType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthzDecisionStatementType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/BaseIDAbstractType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionAbstractType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionsType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/DecisionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedAssertionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedElementType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EvidenceType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/KeyInfoConfirmationDataType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/NameIDType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/OneTimeUseType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ProxyRestrictionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/StatementAbstractType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationDataType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectLocalityType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/URIType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/package-info.java Log: add new saml2 assertion model Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ActionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ActionType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ActionType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,94 @@ +/* + * 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.newmodel.saml.v2.assertion; + + +/** + * Java class for ActionType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ActionType"> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="Namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </extension> + * </simpleContent> + * </complexType> + * </pre> + * + * + */ +public class ActionType { + + protected String value; + protected String namespace; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the namespace property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNamespace() { + return namespace; + } + + /** + * Sets the value of the namespace property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNamespace(String value) { + this.namespace = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AdviceType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AdviceType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AdviceType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,69 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for AdviceType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AdviceType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <choice maxOccurs="unbounded" minOccurs="0"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionURIRef"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/> + * <any/> + * </choice> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class AdviceType +{ + protected List<Object> advices = new ArrayList<Object>(); + + public void addAdvice( Object obj ) + { + advices.add( obj ); + } + + /** + * Gets the advices. + */ + public List<Object> getAdvices() + { + return Collections.unmodifiableList( advices ); + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AssertionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AssertionType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AssertionType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,148 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.util.Collection; +import java.util.Collections; +import java.util.Set; +import java.util.TreeSet; + +import javax.xml.datatype.XMLGregorianCalendar; + +import org.w3c.dom.Element; + +/** + <complexType name="AssertionType"> + <sequence> + <element ref="saml:Issuer"/> + <element ref="ds:Signature" minOccurs="0"/> + <element ref="saml:Subject" minOccurs="0"/> + <element ref="saml:Conditions" minOccurs="0"/> + <element ref="saml:Advice" minOccurs="0"/> + <choice minOccurs="0" maxOccurs="unbounded"> + <element ref="saml:Statement"/> + <element ref="saml:AuthnStatement"/> + <element ref="saml:AuthzDecisionStatement"/> + <element ref="saml:AttributeStatement"/> + </choice> + </sequence> + <attribute name="Version" type="string" use="required"/> + <attribute name="ID" type="ID" use="required"/> + <attribute name="IssueInstant" type="dateTime" use="required"/> + </complexType> + * @author Anil.Saldhana(a)redhat.com + * @since Nov 24, 2010 + */ +public class AssertionType +{ + private String ID; + + private Element signature; + + private XMLGregorianCalendar issueInstant; + + private String version; + + private AdviceType advice; + + private NameIDType issuer; + + private ConditionsType conditions; + + private Set<StatementAbstractType> statements = new TreeSet<StatementAbstractType>(); + + public AssertionType(String iD, XMLGregorianCalendar issueInstant, String version) + { + this.ID = iD; + this.issueInstant = issueInstant; + this.version = version; + } + + public String getID() + { + return ID; + } + + public XMLGregorianCalendar getIssueInstant() + { + return issueInstant; + } + + public String getVersion() + { + return version; + } + + public AdviceType getAdvice() + { + return advice; + } + + public void setAdvice(AdviceType advice) + { + this.advice = advice; + } + + public ConditionsType getConditions() + { + return conditions; + } + + public void setConditions(ConditionsType conditions) + { + this.conditions = conditions; + } + + public NameIDType getIssuer() + { + return issuer; + } + + public void setIssuer(NameIDType issuer) + { + this.issuer = issuer; + } + + public void addStatement( StatementAbstractType statement ) + { + this.statements.add( statement ); + } + public void addStatements( Collection<StatementAbstractType> statement ) + { + this.statements.addAll( statement ); + } + + public Set<StatementAbstractType> getStatements() + { + return Collections.unmodifiableSet( statements ); + } + + public Element getSignature() + { + return signature; + } + + public void setSignature(Element signature) + { + this.signature = signature; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeStatementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeStatementType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeStatementType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,93 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + + +/** + * Java class for AttributeStatementType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AttributeStatementType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType"> + * <choice maxOccurs="unbounded"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAttribute"/> + * </choice> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class AttributeStatementType +extends StatementAbstractType +{ + protected List<ChoiceType> attributes = new ArrayList<ChoiceType>(); + + public void addAttribute( ChoiceType attribute ) + { + attributes.add( attribute ); + } + + /** + * Gets the attributes. + */ + public List<ChoiceType> getAttributes() + { + return Collections.unmodifiableList( this.attributes ); + } + + public static class ChoiceType + { + private AttributeType attribute; + private EncryptedElementType encryptedAssertion; + + public ChoiceType(AttributeType attribute) + { + super(); + this.attribute = attribute; + } + public ChoiceType(EncryptedElementType encryptedAssertion) + { + super(); + this.encryptedAssertion = encryptedAssertion; + } + public AttributeType getAttribute() + { + return attribute; + } + public EncryptedElementType getEncryptedAssertion() + { + return encryptedAssertion; + } + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,183 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.xml.namespace.QName; + +/** + * Java class for AttributeType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AttributeType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeValue" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="NameFormat" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + */ +public class AttributeType +{ + protected List<Object> attributeValue = new ArrayList<Object>(); + protected String name; + protected String nameFormat; + protected String friendlyName; + private Map<QName, String> otherAttributes = new HashMap<QName, String>(); + + public void addAttributeValue( Object value ) + { + attributeValue.add(value); + } + + /** + * Gets the value of the attributeValue property. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getAttributeValue().add(newItem); + * </pre> + * + * + * + * Objects of the following type(s) are allowed in the list + * {@link Object } + * + * + */ + public List<Object> getAttributeValue() + { + return Collections.unmodifiableList( this.attributeValue ); + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() + { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) + { + this.name = value; + } + + /** + * Gets the value of the nameFormat property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNameFormat() + { + return nameFormat; + } + + /** + * Sets the value of the nameFormat property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNameFormat(String value) + { + this.nameFormat = value; + } + + /** + * Gets the value of the friendlyName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFriendlyName() + { + return friendlyName; + } + + /** + * Sets the value of the friendlyName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFriendlyName(String value) + { + this.friendlyName = value; + } + + /** + * Gets a map that contains attributes that aren't bound to any typed property on this class. + * + * + * the map is keyed by the name of the attribute and + * the value is the string value of the attribute. + * + * the map returned by this method is live, and you can add new attribute + * by updating the map directly. Because of this design, there's no setter. + * + * + * @return + * always non-null + */ + public Map<QName, String> getOtherAttributes() + { + return otherAttributes; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AudienceRestrictionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AudienceRestrictionType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AudienceRestrictionType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,65 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * Java class for AudienceRestrictionType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AudienceRestrictionType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Audience" maxOccurs="unbounded"/> + * </sequence> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class AudienceRestrictionType +extends ConditionAbstractType +{ + protected List<URI> audience = new ArrayList<URI>(); + + public void addAudience( URI audienceval ) + { + audience.add( audienceval ); + } + + /** + * Gets the value of the audience property. + */ + public List<URI> getAudience() + { + return Collections.unmodifiableList( this.audience ); + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextClassRefType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextClassRefType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextClassRefType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,79 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.net.URI; + +/** + * Type that represents an AuthnContextClassRef + * @author Anil.Saldhana(a)redhat.com + * @since Nov 24, 2010 + */ +public class AuthnContextClassRefType implements URIType +{ + private URI value; + + public AuthnContextClassRefType( URI value ) + { + this.value = value; + } + + public URI getValue() + { + return value; + } + + @Override + public String toString() + { + return "AuthnContextClassRefType [value=" + value + "]"; + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + ((value == null) ? 0 : value.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AuthnContextClassRefType other = (AuthnContextClassRefType) obj; + if (value == null) + { + if (other.value != null) + return false; + } + else if (!value.equals(other.value)) + return false; + return true; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclRefType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclRefType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclRefType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,73 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.net.URI; + +/** + * Type that represents an AuthnContextDeclRef + * @author Anil.Saldhana(a)redhat.com + * @since Nov 24, 2010 + */ +public class AuthnContextDeclRefType implements URIType +{ + private URI value; + + public AuthnContextDeclRefType(URI value) + { + this.value = value; + } + + public URI getValue() + { + return value; + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + ((value == null) ? 0 : value.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AuthnContextDeclRefType other = (AuthnContextDeclRefType) obj; + if (value == null) + { + if (other.value != null) + return false; + } + else if (!value.equals(other.value)) + return false; + return true; + } +} Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,79 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.net.URI; + +/** + * Type that represents an AuthnContextDecl + * @author Anil.Saldhana(a)redhat.com + * @since Nov 24, 2010 + */ +public class AuthnContextDeclType implements URIType +{ + private URI value; + + public AuthnContextDeclType( URI value ) + { + this.value = value; + } + + public URI getValue() + { + return value; + } + + @Override + public String toString() + { + return "AuthnContextDeclType [value=" + value + "]"; + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + ((value == null) ? 0 : value.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AuthnContextDeclType other = (AuthnContextDeclType) obj; + if (value == null) + { + if (other.value != null) + return false; + } + else if (!value.equals(other.value)) + return false; + return true; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,149 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.net.URI; +import java.util.Arrays; +import java.util.Collections; +import java.util.Set; +import java.util.TreeSet; + + + +/** + * Java class for AuthnContextType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AuthnContextType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <choice> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextClassRef"/> + * <choice minOccurs="0"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDecl"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef"/> + * </choice> + * </sequence> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDecl"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef"/> + * </choice> + * </choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthenticatingAuthority" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class AuthnContextType +{ + private Set<URI> authenticatingAuthority = new TreeSet<URI>(); + + private AuthnContextTypeSequence sequence; + + private Set<URIType> URITypes; + + + public void addAuthenticatingAuthority( URI aa ) + { + authenticatingAuthority.add( aa ); + } + + public void addAuthenticatingAuthority( URI[] aas ) + { + authenticatingAuthority.addAll( Arrays.asList( aas ) ); + } + + public Set<URI> getAuthenticatingAuthority() + { + return Collections.unmodifiableSet( authenticatingAuthority ); + } + + public AuthnContextTypeSequence getSequence() + { + return sequence; + } + + public void setSequence(AuthnContextTypeSequence sequence) + { + this.sequence = sequence; + } + + public void addURIType( URIType aa ) + { + URITypes.add( aa ); + } + + public void addURIType( URIType[] aas ) + { + URITypes.addAll( Arrays.asList( aas ) ); + } + + public Set<URIType> getURIType() + { + return Collections.unmodifiableSet( URITypes ); + } + + /** + <sequence> + <element ref="saml:AuthnContextClassRef"/> + <choice minOccurs="0"> + <element ref="saml:AuthnContextDecl"/> + <element ref="saml:AuthnContextDeclRef"/> + </choice> + </sequence> + */ + public class AuthnContextTypeSequence + { + private AuthnContextClassRefType classRef; + private Set<URIType> URITypes; + public AuthnContextClassRefType getClassRef() + { + return classRef; + } + public void setClassRef(AuthnContextClassRefType classRef) + { + this.classRef = classRef; + } + public void addURIType( URIType aa ) + { + URITypes.add( aa ); + } + + public void addURIType( URIType[] aas ) + { + URITypes.addAll( Arrays.asList( aas ) ); + } + + public Set<URIType> getURIType() + { + return Collections.unmodifiableSet( URITypes ); + } + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnStatementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnStatementType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnStatementType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,173 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + * Java class for AuthnStatementType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AuthnStatementType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectLocality" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContext"/> + * </sequence> + * <attribute name="AuthnInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="SessionNotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class AuthnStatementType +extends StatementAbstractType +{ + + protected SubjectLocalityType subjectLocality; + protected AuthnContextType authnContext; + protected XMLGregorianCalendar authnInstant; + protected XMLGregorianCalendar sessionNotOnOrAfter; + + protected String sessionIndex; + + public AuthnStatementType( XMLGregorianCalendar instant ) + { + this.authnInstant = instant; + } + + /** + * Gets the value of the subjectLocality property. + * + * @return + * possible object is + * {@link SubjectLocalityType } + * + */ + public SubjectLocalityType getSubjectLocality() { + return subjectLocality; + } + + /** + * Sets the value of the subjectLocality property. + * + * @param value + * allowed object is + * {@link SubjectLocalityType } + * + */ + public void setSubjectLocality(SubjectLocalityType value) { + this.subjectLocality = value; + } + + /** + * Gets the value of the authnContext property. + * + * @return + * possible object is + * {@link AuthnContextType } + * + */ + public AuthnContextType getAuthnContext() { + return authnContext; + } + + /** + * Sets the value of the authnContext property. + * + * @param value + * allowed object is + * {@link AuthnContextType } + * + */ + public void setAuthnContext(AuthnContextType value) { + this.authnContext = value; + } + + /** + * Gets the value of the authnInstant property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getAuthnInstant() { + return authnInstant; + } + + /** + * Gets the value of the sessionIndex property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSessionIndex() { + return sessionIndex; + } + + /** + * Sets the value of the sessionIndex property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSessionIndex(String value) { + this.sessionIndex = value; + } + + /** + * Gets the value of the sessionNotOnOrAfter property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getSessionNotOnOrAfter() { + return sessionNotOnOrAfter; + } + + /** + * Sets the value of the sessionNotOnOrAfter property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setSessionNotOnOrAfter(XMLGregorianCalendar value) { + this.sessionNotOnOrAfter = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthzDecisionStatementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthzDecisionStatementType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthzDecisionStatementType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,159 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.util.ArrayList; +import java.util.List; + + +/** + * Java class for AuthzDecisionStatementType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AuthzDecisionStatementType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Action" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Evidence" minOccurs="0"/> + * </sequence> + * <attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="Decision" use="required" type="{urn:oasis:names:tc:SAML:2.0:assertion}DecisionType" /> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class AuthzDecisionStatementType + extends StatementAbstractType +{ + + protected List<ActionType> action; + protected EvidenceType evidence; + protected String resource; + protected DecisionType decision; + + /** + * Gets the value of the action property. + * + * + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the action property. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getAction().add(newItem); + * </pre> + * + * + * + * Objects of the following type(s) are allowed in the list + * {@link ActionType } + * + * + */ + public List<ActionType> getAction() { + if (action == null) { + action = new ArrayList<ActionType>(); + } + return this.action; + } + + /** + * Gets the value of the evidence property. + * + * @return + * possible object is + * {@link EvidenceType } + * + */ + public EvidenceType getEvidence() { + return evidence; + } + + /** + * Sets the value of the evidence property. + * + * @param value + * allowed object is + * {@link EvidenceType } + * + */ + public void setEvidence(EvidenceType value) { + this.evidence = value; + } + + /** + * Gets the value of the resource property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getResource() { + return resource; + } + + /** + * Sets the value of the resource property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setResource(String value) { + this.resource = value; + } + + /** + * Gets the value of the decision property. + * + * @return + * possible object is + * {@link DecisionType } + * + */ + public DecisionType getDecision() { + return decision; + } + + /** + * Sets the value of the decision property. + * + * @param value + * allowed object is + * {@link DecisionType } + * + */ + public void setDecision(DecisionType value) { + this.decision = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/BaseIDAbstractType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/BaseIDAbstractType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/BaseIDAbstractType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,60 @@ +/* + * 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.newmodel.saml.v2.assertion; + +/** + * Abstract Type that represents an ID + <pre> + <attributeGroup name="IDNameQualifiers"> + <attribute name="NameQualifier" type="string" use="optional"/> + <attribute name="SPNameQualifier" type="string" use="optional"/> + </attributeGroup> + + <complexType name="BaseIDAbstractType" abstract="true"> + <attributeGroup ref="saml:IDNameQualifiers"/> + </complexType> + </pre> + * @author Anil.Saldhana(a)redhat.com + * @since Nov 24, 2010 + */ +public abstract class BaseIDAbstractType +{ + private String nameQualifier; + private String sPNameQualifier; + + public String getNameQualifier() + { + return nameQualifier; + } + public void setNameQualifier(String nameQualifier) + { + this.nameQualifier = nameQualifier; + } + public String getSPNameQualifier() + { + return sPNameQualifier; + } + public void setSPNameQualifier(String sPNameQualifier) + { + this.sPNameQualifier = sPNameQualifier; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionAbstractType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionAbstractType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionAbstractType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,43 @@ +/* + * 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.newmodel.saml.v2.assertion; + + +/** + * Java class for ConditionAbstractType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ConditionAbstractType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public abstract class ConditionAbstractType +{ +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionsType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionsType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionsType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,121 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + * Java class for ConditionsType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ConditionsType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <choice maxOccurs="unbounded" minOccurs="0"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Condition"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AudienceRestriction"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}OneTimeUse"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}ProxyRestriction"/> + * </choice> + * <attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class ConditionsType +{ + protected List<ConditionAbstractType> conditions = new ArrayList<ConditionAbstractType>(); + protected XMLGregorianCalendar notBefore; + protected XMLGregorianCalendar notOnOrAfter; + + public void addCondition( ConditionAbstractType condition ) + { + this.conditions.add( condition ); + } + + /** + * Gets an read only conditions list. + */ + public List<ConditionAbstractType> getConditions() + { + return Collections.unmodifiableList( this.conditions ); + } + + /** + * Gets the value of the notBefore property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getNotBefore() { + return notBefore; + } + + /** + * Sets the value of the notBefore property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setNotBefore(XMLGregorianCalendar value) { + this.notBefore = value; + } + + /** + * Gets the value of the notOnOrAfter property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getNotOnOrAfter() { + return notOnOrAfter; + } + + /** + * Sets the value of the notOnOrAfter property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setNotOnOrAfter(XMLGregorianCalendar value) { + this.notOnOrAfter = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/DecisionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/DecisionType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/DecisionType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,66 @@ +/* + * 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.newmodel.saml.v2.assertion; + +/** + * Java class for DecisionType. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <simpleType name="DecisionType"> + * <restriction base="{http://www.w3.org/2001/XMLSchema}string"> + * <enumeration value="Permit"/> + * <enumeration value="Deny"/> + * <enumeration value="Indeterminate"/> + * </restriction> + * </simpleType> + * </pre> + * + */ +public enum DecisionType +{ + PERMIT("Permit"), + DENY("Deny"), + INDETERMINATE("Indeterminate"); + private final String value; + + DecisionType(String v) { + value = v; + } + + public String value() { + return value; + } + + public static DecisionType fromValue(String v) + { + for (DecisionType c: DecisionType.values()) + { + if (c.value.equals(v)) + { + return c; + } + } + throw new IllegalArgumentException(v); + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedAssertionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedAssertionType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedAssertionType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,31 @@ +/* + * 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.newmodel.saml.v2.assertion; + +/** + * Assertion that is encrypted + * @author Anil.Saldhana(a)redhat.com + * @since Nov 24, 2010 + */ +public class EncryptedAssertionType extends EncryptedElementType +{ +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedElementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedElementType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedElementType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,53 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import org.w3c.dom.Element; + +/** + * Represents an element that is encrypted + * @author Anil.Saldhana(a)redhat.com + * @since Nov 24, 2010 + */ +public class EncryptedElementType +{ + /** + <complexType name="EncryptedElementType"> + <sequence> + <element ref="xenc:EncryptedData"/> + <element ref="xenc:EncryptedKey" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + */ + + private Element encryptedElement; + + public Element getEncryptedElement() + { + return encryptedElement; + } + + public void setEncryptedElement(Element encryptedElement) + { + this.encryptedElement = encryptedElement; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EvidenceType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EvidenceType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EvidenceType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,115 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for EvidenceType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="EvidenceType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <choice maxOccurs="unbounded"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionURIRef"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/> + * </choice> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class EvidenceType +{ + protected List<ChoiceType> evidences = new ArrayList<ChoiceType>(); + + public void addEvidence( ChoiceType evidence ) + { + evidences.add( evidence ); + } + + public List<ChoiceType> evidences() + { + return Collections.unmodifiableList( evidences ); + } + + public static class ChoiceType + { + private String AssertionIDRef; + private URI AssertionURIRef; + private AssertionType assertion; + private EncryptedAssertionType encryptedAssertion; + + public ChoiceType(String assertionIDRef) + { + AssertionIDRef = assertionIDRef; + } + + public ChoiceType(URI assertionURIRef) + { + AssertionURIRef = assertionURIRef; + } + + public ChoiceType(AssertionType assertion) + { + this.assertion = assertion; + } + + public ChoiceType(EncryptedAssertionType encryptedAssertion) + { + this.encryptedAssertion = encryptedAssertion; + } + + public String getAssertionIDRef() + { + return AssertionIDRef; + } + + public URI getAssertionURIRef() + { + return AssertionURIRef; + } + + public AssertionType getAssertion() + { + return assertion; + } + + public EncryptedAssertionType getEncryptedAssertion() + { + return encryptedAssertion; + } + + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/KeyInfoConfirmationDataType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/KeyInfoConfirmationDataType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/KeyInfoConfirmationDataType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,58 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import org.w3c.dom.Element; + +/** + * Java class for KeyInfoConfirmationDataType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="KeyInfoConfirmationDataType"> + * <complexContent> + * <restriction base="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationDataType"> + * <sequence> + * <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" maxOccurs="unbounded"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class KeyInfoConfirmationDataType extends SubjectConfirmationDataType +{ + protected Element keyInfo; + + public Element getKeyInfo() + { + return keyInfo; + } + + public void setKeyInfo(Element keyInfo) + { + this.keyInfo = keyInfo; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/NameIDType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/NameIDType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/NameIDType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,78 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.net.URI; + +/** + * Represents a NameIDType + * @author Anil.Saldhana(a)redhat.com + * @since Nov 24, 2010 + */ +public class NameIDType extends BaseIDAbstractType +{ + /* + <complexType name="NameIDType"> + <simpleContent> + <extension base="string"> + <attributeGroup ref="saml:IDNameQualifiers"/> + <attribute name="Format" type="anyURI" use="optional"/> + <attribute name="SPProvidedID" type="string" use="optional"/> + </extension> + </simpleContent> + </complexType> + + <attributeGroup name="IDNameQualifiers"> + <attribute name="NameQualifier" type="string" use="optional"/> + <attribute name="SPNameQualifier" type="string" use="optional"/> + </attributeGroup> + */ + + + private URI format; + private String sPProvidedID; + + public String getsPProvidedID() + { + return sPProvidedID; + } + public void setsPProvidedID(String sPProvidedID) + { + this.sPProvidedID = sPProvidedID; + } + public URI getFormat() + { + return format; + } + public void setFormat(URI format) + { + this.format = format; + } + public String getSPProvidedID() + { + return sPProvidedID; + } + public void setSPProvidedID(String sPProvidedID) + { + this.sPProvidedID = sPProvidedID; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/OneTimeUseType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/OneTimeUseType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/OneTimeUseType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,44 @@ +/* + * 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.newmodel.saml.v2.assertion; + + +/** + * Java class for OneTimeUseType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="OneTimeUseType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType"> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class OneTimeUseType + extends ConditionAbstractType +{ +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ProxyRestrictionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ProxyRestrictionType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ProxyRestrictionType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,95 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.math.BigInteger; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for ProxyRestrictionType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ProxyRestrictionType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Audience" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="Count" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class ProxyRestrictionType +extends ConditionAbstractType +{ + protected List<URI> audience = new ArrayList<URI>(); + + protected BigInteger count; + + public void addAudience( URI a ) + { + this.audience.add( a ); + } + + /** + * Gets the value of the audience property. + * + */ + public List<URI> getAudience() + { + return Collections.unmodifiableList( audience ); + } + + /** + * Gets the value of the count property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getCount() { + return count; + } + + /** + * Sets the value of the count property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setCount(BigInteger value) { + this.count = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/StatementAbstractType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/StatementAbstractType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/StatementAbstractType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,45 @@ +/* + * 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.newmodel.saml.v2.assertion; + + + +/** + * Java class for StatementAbstractType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="StatementAbstractType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public abstract class StatementAbstractType +{ +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationDataType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationDataType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationDataType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,216 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; + + +/** + * Java class for SubjectConfirmationDataType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="SubjectConfirmationDataType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <any/> + * </sequence> + * <attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="Recipient" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" /> + * <attribute name="Address" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class SubjectConfirmationDataType +{ + protected XMLGregorianCalendar notBefore; + protected XMLGregorianCalendar notOnOrAfter; + protected String recipient; + protected String inResponseTo; + protected String address; + private Map<QName, String> otherAttributes = new HashMap<QName, String>(); + + private Object anyType; + + public Object getAnyType() + { + return anyType; + } + + public void setAnyType(Object anyType) + { + this.anyType = anyType; + } + + /** + * Gets the value of the notBefore property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getNotBefore() { + return notBefore; + } + + /** + * Sets the value of the notBefore property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setNotBefore(XMLGregorianCalendar value) { + this.notBefore = value; + } + + /** + * Gets the value of the notOnOrAfter property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getNotOnOrAfter() { + return notOnOrAfter; + } + + /** + * Sets the value of the notOnOrAfter property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setNotOnOrAfter(XMLGregorianCalendar value) { + this.notOnOrAfter = value; + } + + /** + * Gets the value of the recipient property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRecipient() { + return recipient; + } + + /** + * Sets the value of the recipient property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRecipient(String value) { + this.recipient = value; + } + + /** + * Gets the value of the inResponseTo property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getInResponseTo() { + return inResponseTo; + } + + /** + * Sets the value of the inResponseTo property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setInResponseTo(String value) { + this.inResponseTo = value; + } + + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAddress() { + return address; + } + + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAddress(String value) { + this.address = value; + } + + /** + * Gets a map that contains attributes that aren't bound to any typed property on this class. + * + * + * the map is keyed by the name of the attribute and + * the value is the string value of the attribute. + * + * @return + * always non-null + */ + public Map<QName, String> getOtherAttributes() + { + return Collections.unmodifiableMap( otherAttributes ); + } + + public void addOtherAttribute( QName qname, String str ) + { + otherAttributes.put(qname, str ); + } +} Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,180 @@ +/* + * 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.newmodel.saml.v2.assertion; + + + +/** + * Java class for SubjectConfirmationType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="SubjectConfirmationType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <choice minOccurs="0"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/> + * </choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationData" minOccurs="0"/> + * </sequence> + * <attribute name="Method" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class SubjectConfirmationType +{ + + protected BaseIDAbstractType baseID; + protected NameIDType nameID; + protected EncryptedElementType encryptedID; + protected SubjectConfirmationDataType subjectConfirmationData; + protected String method; + + /** + * Gets the value of the baseID property. + * + * @return + * possible object is + * {@link BaseIDAbstractType } + * + */ + public BaseIDAbstractType getBaseID() { + return baseID; + } + + /** + * Sets the value of the baseID property. + * + * @param value + * allowed object is + * {@link BaseIDAbstractType } + * + */ + public void setBaseID(BaseIDAbstractType value) { + this.baseID = value; + } + + /** + * Gets the value of the nameID property. + * + * @return + * possible object is + * {@link NameIDType } + * + */ + public NameIDType getNameID() { + return nameID; + } + + /** + * Sets the value of the nameID property. + * + * @param value + * allowed object is + * {@link NameIDType } + * + */ + public void setNameID(NameIDType value) { + this.nameID = value; + } + + /** + * Gets the value of the encryptedID property. + * + * @return + * possible object is + * {@link EncryptedElementType } + * + */ + public EncryptedElementType getEncryptedID() { + return encryptedID; + } + + /** + * Sets the value of the encryptedID property. + * + * @param value + * allowed object is + * {@link EncryptedElementType } + * + */ + public void setEncryptedID(EncryptedElementType value) { + this.encryptedID = value; + } + + /** + * Gets the value of the subjectConfirmationData property. + * + * @return + * possible object is + * {@link SubjectConfirmationDataType } + * + */ + public SubjectConfirmationDataType getSubjectConfirmationData() { + return subjectConfirmationData; + } + + /** + * Sets the value of the subjectConfirmationData property. + * + * @param value + * allowed object is + * {@link SubjectConfirmationDataType } + * + */ + public void setSubjectConfirmationData(SubjectConfirmationDataType value) { + this.subjectConfirmationData = value; + } + + /** + * Gets the value of the method property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMethod() { + return method; + } + + /** + * Sets the value of the method property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMethod(String value) { + this.method = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectLocalityType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectLocalityType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectLocalityType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,95 @@ +/* + * 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.newmodel.saml.v2.assertion; + + +/** + * Java class for SubjectLocalityType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="SubjectLocalityType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="Address" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="DNSName" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class SubjectLocalityType +{ + protected String address; + protected String dnsName; + + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAddress() { + return address; + } + + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAddress(String value) { + this.address = value; + } + + /** + * Gets the value of the dnsName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDNSName() { + return dnsName; + } + + /** + * Sets the value of the dnsName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDNSName(String value) { + this.dnsName = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,119 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + + +/** + * Java class for SubjectType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="SubjectType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <choice> + * <sequence> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/> + * </choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmation" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmation" maxOccurs="unbounded"/> + * </choice> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class SubjectType +{ + protected List<SubjectConfirmationType> subjectConfirmation = new ArrayList<SubjectConfirmationType>(); + + protected SubType subType; + + public SubType getSubType() + { + return subType; + } + + public void setSubType(SubType subType) + { + this.subType = subType; + } + + public int getCount() + { + return subjectConfirmation.size(); + } + + public List<SubjectConfirmationType> getConfirmation() + { + return Collections.unmodifiableList( subjectConfirmation ); + } + + public void addConfirmation( SubjectConfirmationType con ) + { + subjectConfirmation.add( con ); + } + + public static class SubType + { + private BaseIDAbstractType baseID; + + protected List<SubjectConfirmationType> subjectConfirmation = new ArrayList<SubjectConfirmationType>(); + + public void addBaseID( BaseIDAbstractType base ) + { + this.baseID = base; + } + + public BaseIDAbstractType getBaseID() + { + return baseID; + } + + public void addConfirmation( SubjectConfirmationType con ) + { + subjectConfirmation.add( con ); + } + + public int getCount() + { + return subjectConfirmation.size(); + } + + public List<SubjectConfirmationType> getConfirmation() + { + return Collections.unmodifiableList( subjectConfirmation ); + } + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/URIType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/URIType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/URIType.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,34 @@ +/* + * 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.newmodel.saml.v2.assertion; + +import java.net.URI; + +/** + * A type that holds {@code URI} + * @author Anil.Saldhana(a)redhat.com + * @since Nov 24, 2010 + */ +public interface URIType +{ + URI getValue(); +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/package-info.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/package-info.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/package-info.java 2010-11-24 22:08:52 UTC (rev 561) @@ -0,0 +1,4 @@ +/** + * Package for the model classes for the SAML2 Assertion + */ +package org.picketlink.identity.federation.newmodel.saml.v2.assertion; \ No newline at end of file

14 years, 1 month

1
0
0 / 0

Picketlink SVN: r560 - idm/branches/1.1.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/managers.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2010-11-19 04:30:54 -0500 (Fri, 19 Nov 2010) New Revision: 560 Modified: idm/branches/1.1.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/managers/RelationshipManagerImpl.java Log: - fix missing cache store operation in RelationshipManager.findRelatedGroups() method Modified: idm/branches/1.1.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/managers/RelationshipManagerImpl.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/managers/RelationshipManagerImpl.java 2010-11-18 16:29:00 UTC (rev 559) +++ idm/branches/1.1.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/managers/RelationshipManagerImpl.java 2010-11-19 09:30:54 UTC (rev 560) @@ -1280,11 +1280,7 @@ search.setGroupType(groupType); search.setSearchCriteria(criteria); - Collection<Group> results = cache.getGroupSearch(cacheNS, search); - if (results != null) - { - return results; - } + cache.putGroupSearch(cacheNS, search, identities); } return identities;

14 years, 1 month

1
0
0 / 0

Picketlink SVN: r559 - in federation/trunk/picketlink-fed-core/src: test/java/org/picketlink/test/identity/federation/core/parser/wst and 1 other directory.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2010-11-18 11:29:00 -0500 (Thu, 18 Nov 2010) New Revision: 559 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustIssueTestCase.java Log: unused Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java 2010-11-18 16:22:16 UTC (rev 558) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java 2010-11-18 16:29:00 UTC (rev 559) @@ -263,8 +263,7 @@ * @param entropy a reference to the {@code EntropyType} that contains the binary secret. * @return a {@code byte[]} containing the secret; {@code null} if the specified entropy doesn't contain * any secret. - */ - @SuppressWarnings("rawtypes") + */ public static byte[] getBinarySecret(EntropyType entropy) { byte[] secret = null; Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustIssueTestCase.java =================================================================== --- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustIssueTestCase.java 2010-11-18 16:22:16 UTC (rev 558) +++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustIssueTestCase.java 2010-11-18 16:29:00 UTC (rev 559) @@ -27,8 +27,6 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; -import javax.xml.transform.dom.DOMSource; - import org.junit.Test; import org.picketlink.identity.federation.core.parsers.wst.WSTrustParser; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;

14 years, 1 month

1
0
0 / 0

Picketlink SVN: r558 - in federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core: wstrust and 1 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2010-11-18 11:22:16 -0500 (Thu, 18 Nov 2010) New Revision: 558 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java Log: rename const Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java 2010-11-18 16:21:29 UTC (rev 557) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java 2010-11-18 16:22:16 UTC (rev 558) @@ -191,7 +191,7 @@ { KeyInfoType keyInfo = parseKeyInfo(xmlEventReader); QName qname = new QName( WSTrustConstants.XMLDSig.DSIG_NS, WSTrustConstants.XMLDSig.KEYINFO, - WSTrustConstants.XMLDSig.PREFIX ); + WSTrustConstants.XMLDSig.DSIG_PREFIX ); JAXBElement<?> jaxb = new JAXBElement(qname, KeyInfoType.class, keyInfo ); subjectConfirmationData.getContent().add( jaxb ); } @@ -235,7 +235,7 @@ StaxParserUtil.validate(startElement, WSTrustConstants.XMLDSig.X509CERT ); String certValue = StaxParserUtil.getElementText(xmlEventReader); - QName qname = new QName( WSTrustConstants.DSIG_NS, WSTrustConstants.XMLDSig.X509CERT, WSTrustConstants.XMLDSig.PREFIX ); + QName qname = new QName( WSTrustConstants.DSIG_NS, WSTrustConstants.XMLDSig.X509CERT, WSTrustConstants.XMLDSig.DSIG_PREFIX ); JAXBElement<?> cert = new JAXBElement<byte[]>( qname, byte[].class, certValue.getBytes() ); x509.getX509IssuerSerialOrX509SKIOrX509SubjectName().add( cert ); EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2010-11-18 16:21:29 UTC (rev 557) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2010-11-18 16:22:16 UTC (rev 558) @@ -116,7 +116,7 @@ String KEYINFO = "KeyInfo"; String KEYVALUE = "KeyValue"; String MODULUS = "Modulus"; - String PREFIX = "ds"; + String DSIG_PREFIX = "ds"; String RSA_KEYVALUE = "RSAKeyValue"; String X509DATA = "X509Data"; String X509CERT = "X509Certificate"; Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java 2010-11-18 16:21:29 UTC (rev 557) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java 2010-11-18 16:22:16 UTC (rev 558) @@ -257,9 +257,9 @@ else if (useKeyTypeValue instanceof byte[]) { byte[] certificate = (byte[]) useKeyTypeValue; - StaxUtil.writeStartElement(writer, WSTrustConstants.XMLDSig.PREFIX , WSTrustConstants.XMLDSig.X509CERT, + StaxUtil.writeStartElement(writer, WSTrustConstants.XMLDSig.DSIG_PREFIX , WSTrustConstants.XMLDSig.X509CERT, WSTrustConstants.DSIG_NS); - StaxUtil.writeNameSpace( writer, WSTrustConstants.XMLDSig.PREFIX , WSTrustConstants.DSIG_NS); + StaxUtil.writeNameSpace( writer, WSTrustConstants.XMLDSig.DSIG_PREFIX , WSTrustConstants.DSIG_NS); StaxUtil.writeCharacters(writer, new String(certificate)); StaxUtil.writeEndElement(writer); } @@ -275,8 +275,8 @@ private void writeKeyValueType(KeyValueType type) throws ProcessingException { - StaxUtil.writeStartElement(writer, WSTrustConstants.XMLDSig.PREFIX , WSTrustConstants.XMLDSig.KEYVALUE, WSTrustConstants.DSIG_NS); - StaxUtil.writeNameSpace(writer, WSTrustConstants.XMLDSig.PREFIX , WSTrustConstants.DSIG_NS); + StaxUtil.writeStartElement(writer, WSTrustConstants.XMLDSig.DSIG_PREFIX , WSTrustConstants.XMLDSig.KEYVALUE, WSTrustConstants.DSIG_NS); + StaxUtil.writeNameSpace(writer, WSTrustConstants.XMLDSig.DSIG_PREFIX , WSTrustConstants.DSIG_NS); if (type.getContent().size() == 0) throw new ProcessingException("KeyValueType must contain at least one value");

14 years, 1 month

1
0
0 / 0

Picketlink SVN: r557 - in federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust: writers and 1 other directory.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2010-11-18 11:21:29 -0500 (Thu, 18 Nov 2010) New Revision: 557 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java Log: use constants Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2010-11-17 16:22:52 UTC (rev 556) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2010-11-18 16:21:29 UTC (rev 557) @@ -112,8 +112,12 @@ public interface XMLDSig { String DSIG_NS = "http://www.w3.org/2000/09/xmldsig#"; + String EXPONENT = "Exponent"; String KEYINFO = "KeyInfo"; + String KEYVALUE = "KeyValue"; + String MODULUS = "Modulus"; String PREFIX = "ds"; + String RSA_KEYVALUE = "RSAKeyValue"; String X509DATA = "X509Data"; String X509CERT = "X509Certificate"; } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java 2010-11-17 16:22:52 UTC (rev 556) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java 2010-11-18 16:21:29 UTC (rev 557) @@ -257,8 +257,9 @@ else if (useKeyTypeValue instanceof byte[]) { byte[] certificate = (byte[]) useKeyTypeValue; - StaxUtil.writeStartElement(writer, "dsig", "X509Certificate", WSTrustConstants.DSIG_NS); - StaxUtil.writeNameSpace( writer, "dsig", WSTrustConstants.DSIG_NS); + StaxUtil.writeStartElement(writer, WSTrustConstants.XMLDSig.PREFIX , WSTrustConstants.XMLDSig.X509CERT, + WSTrustConstants.DSIG_NS); + StaxUtil.writeNameSpace( writer, WSTrustConstants.XMLDSig.PREFIX , WSTrustConstants.DSIG_NS); StaxUtil.writeCharacters(writer, new String(certificate)); StaxUtil.writeEndElement(writer); } @@ -274,8 +275,8 @@ private void writeKeyValueType(KeyValueType type) throws ProcessingException { - StaxUtil.writeStartElement(writer, "dsig", WSTrustConstants.KEY_VALUE, WSTrustConstants.DSIG_NS); - StaxUtil.writeNameSpace(writer, "dsig", WSTrustConstants.DSIG_NS); + StaxUtil.writeStartElement(writer, WSTrustConstants.XMLDSig.PREFIX , WSTrustConstants.XMLDSig.KEYVALUE, WSTrustConstants.DSIG_NS); + StaxUtil.writeNameSpace(writer, WSTrustConstants.XMLDSig.PREFIX , WSTrustConstants.DSIG_NS); if (type.getContent().size() == 0) throw new ProcessingException("KeyValueType must contain at least one value"); @@ -292,16 +293,16 @@ private void writeRSAKeyValueType(RSAKeyValueType type) throws ProcessingException { - StaxUtil.writeStartElement(writer, "dsig", "RSAKeyValue", WSTrustConstants.DSIG_NS); + StaxUtil.writeStartElement(writer, "dsig", WSTrustConstants.XMLDSig.RSA_KEYVALUE , WSTrustConstants.DSIG_NS); // write the rsa key modulus. byte[] modulus = type.getModulus(); - StaxUtil.writeStartElement(writer, "dsig", "Modulus", WSTrustConstants.DSIG_NS); + StaxUtil.writeStartElement(writer, "dsig", WSTrustConstants.XMLDSig.MODULUS , WSTrustConstants.DSIG_NS); StaxUtil.writeCharacters(writer, new String(modulus)); StaxUtil.writeEndElement(writer); // write the rsa key exponent. byte[] exponent = type.getExponent(); - StaxUtil.writeStartElement(writer, "dsig", "Exponent", WSTrustConstants.DSIG_NS); + StaxUtil.writeStartElement(writer, "dsig", WSTrustConstants.XMLDSig.EXPONENT , WSTrustConstants.DSIG_NS); StaxUtil.writeCharacters(writer, new String(exponent)); StaxUtil.writeEndElement(writer);

14 years, 1 month

1
0
0 / 0

Picketlink SVN: r556 - in integration-tests/trunk/picketlink-sts-tests: src/test/java/org/picketlink/test/integration/sts and 1 other directory.

by picketlink-commits＠lists.jboss.org

Author: sguilhen(a)redhat.com Date: 2010-11-17 11:22:52 -0500 (Wed, 17 Nov 2010) New Revision: 556 Modified: integration-tests/trunk/picketlink-sts-tests/.classpath integration-tests/trunk/picketlink-sts-tests/.project integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java Log: PLFED-119: changed integration tests to use Stax Modified: integration-tests/trunk/picketlink-sts-tests/.classpath =================================================================== --- integration-tests/trunk/picketlink-sts-tests/.classpath 2010-11-17 13:41:00 UTC (rev 555) +++ integration-tests/trunk/picketlink-sts-tests/.classpath 2010-11-17 16:22:52 UTC (rev 556) @@ -1,18 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry kind="src" path="src/test/resources"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/ant/ant/1.5/ant-1.5.jar"/> - <classpathentry kind="var" path="M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar" sourcepath="M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/httpunit/httpunit/1.7/httpunit-1.7.jar" sourcepath="M2_REPO/httpunit/httpunit/1.7/httpunit-1.7-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/rhino/js/1.6R7/js-1.6R7.jar"/> - <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12.jar"/> - <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed/1.0.4-SNAPSHOT/picketlink-fed-1.0.4-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed/1.0.4-SNAPSHOT/picketlink-fed-1.0.4-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> +</classpath> \ No newline at end of file Modified: integration-tests/trunk/picketlink-sts-tests/.project =================================================================== --- integration-tests/trunk/picketlink-sts-tests/.project 2010-11-17 13:41:00 UTC (rev 555) +++ integration-tests/trunk/picketlink-sts-tests/.project 2010-11-17 16:22:52 UTC (rev 556) @@ -6,8 +6,12 @@ <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> </natures> </projectDescription> \ No newline at end of file Modified: integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java =================================================================== --- integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java 2010-11-17 13:41:00 UTC (rev 555) +++ integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java 2010-11-17 16:22:52 UTC (rev 556) @@ -40,6 +40,7 @@ import org.junit.Test; import org.picketlink.identity.federation.api.wstrust.WSTrustClient; import org.picketlink.identity.federation.api.wstrust.WSTrustClient.SecurityInfo; +import org.picketlink.identity.federation.core.util.Base64; import org.picketlink.identity.federation.core.wstrust.WSTrustConstants; import org.picketlink.identity.federation.core.wstrust.WSTrustUtil; import org.picketlink.identity.federation.core.wstrust.plugins.saml.SAMLUtil; @@ -260,12 +261,11 @@ byte[] clientSecret = WSTrustUtil.createRandomSecret(16); BinarySecretType clientBinarySecret = new BinarySecretType(); clientBinarySecret.setType(WSTrustConstants.BS_TYPE_NONCE); - clientBinarySecret.setValue(clientSecret); + clientBinarySecret.setValue(Base64.encodeBytes(clientSecret).getBytes()); // set the client secret in the client entropy. EntropyType clientEntropy = new EntropyType(); - clientEntropy.getAny().add( - new org.picketlink.identity.federation.ws.trust.ObjectFactory().createBinarySecret(clientBinarySecret)); + clientEntropy.getAny().add(clientBinarySecret); request.setEntropy(clientEntropy); // dispatch the request and get the issued assertion. @@ -301,10 +301,8 @@ request.setKeyType(URI.create(WSTrustConstants.KEY_TYPE_PUBLIC)); // include a UseKey section that specifies the certificate in the request. - JAXBElement<byte[]> certElement = new org.picketlink.identity.xmlsec.w3.xmldsig.ObjectFactory() - .createX509DataTypeX509Certificate(certificate.getEncoded()); UseKeyType useKey = new UseKeyType(); - useKey.setAny(certElement); + useKey.setAny(Base64.encodeBytes(certificate.getEncoded()).getBytes()); request.setUseKey(useKey); // dispatch the request and get the issued assertion. @@ -339,7 +337,7 @@ // include a UseKey section that sets the public key in the request. KeyValueType keyValue = WSTrustUtil.createKeyValue(certificate.getPublicKey()); UseKeyType useKey = new UseKeyType(); - useKey.setAny(new org.picketlink.identity.xmlsec.w3.xmldsig.ObjectFactory().createKeyValue(keyValue)); + useKey.setAny(keyValue); request.setUseKey(useKey); // dispatch the request and get the issued assertion.

14 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

picketlink-commits November 2010