[picketlink-commits] Picketlink SVN: r1189 - in product/trunk: parent and 25 other directories.

Author: anil.saldhana(a)jboss.com Date: 2011-08-11 18:40:00 -0400 (Thu, 11 Aug 2011) New Revision: 1189 Modified: product/trunk/parent/pom.xml product/trunk/picketlink-core/pom.xml product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/X500SAMLProfileConstants.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/SchemaManagerUtil.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wsse/WSSecurityConstants.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/policy/Policy.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/LifetimeType.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/RequestedReferenceType.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/AttributedString.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/BinarySecurityTokenType.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/EncodedString.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/KeyIdentifierType.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/PasswordString.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/SecurityTokenReferenceType.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/UsernameTokenType.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/Constants.java product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/api/util/KeyUtilUnitTestCase.java product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/config/ConfigUnitTestCase.java product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/util/KeystoreUtilUnitTestCase.java product/trunk/picketlink-core/src/test/resources/config/test-config-2.xml product/trunk/picketlink-core/src/test/resources/config/test-metadata-config-1.xml product/trunk/picketlink-core/src/test/resources/jbossws/xml/wsse-saml.xml product/trunk/picketlink-core/src/test/resources/parser/saml2/saml2-authnrequest.xml product/trunk/picketlink-core/src/test/resources/parser/wst/wst-issue-onbehalfof.xml product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-certificate.xml product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-combined.xml product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-pubkey.xml product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-simmetric.xml product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion.xml product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestExample.xml product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestWithSignature.xml product/trunk/picketlink-core/src/test/resources/saml2/metadata/sp-entitydescriptor.xml product/trunk/picketlink-core/src/test/resources/saml2/metadata/testshib-two-metadata.xml product/trunk/picketlink-webapps/idp/pom.xml product/trunk/picketlink-webapps/pdp/pom.xml product/trunk/picketlink-webapps/picketlink-sts/pom.xml product/trunk/picketlink-webapps/pom.xml product/trunk/pom.xml Log: PLFED-226: next 2.0.1 Modified: product/trunk/parent/pom.xml =================================================================== --- product/trunk/parent/pom.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/parent/pom.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -8,7 +8,7 @@ <groupId>org.picketlink.product</groupId> <artifactId>picketlink-fed-parent</artifactId> <packaging>pom</packaging> - <version>2.0.0</version> + <version>2.0.1-SNAPSHOT</version> <name>PicketLink Federation- Parent</name> <url>http://labs.jboss.org/portal/picketlink/</url> <description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description> @@ -23,8 +23,8 @@ <url>http://www.jboss.org</url> </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/product/t... - <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/pro... + <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/product/t... + <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/pro... </scm> <build> Modified: product/trunk/picketlink-core/pom.xml =================================================================== --- product/trunk/picketlink-core/pom.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/pom.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.product</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.0</version> + <version>2.0.1-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/X500SAMLProfileConstants.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/X500SAMLProfileConstants.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/X500SAMLProfileConstants.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -33,28 +33,28 @@ */ public enum X500SAMLProfileConstants { - A_RECORD( "aRecord" , "urn:oid:0.9.2342.19200300.100.1.26" ), + A_RECORD( "aRecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.26" ), ALIASED_ENTRY_NAME( "aliasedEntryName" , "urn:oid:2.5.4.1"), ALIASED_OBJECT_NAME("aliasedObjectName" , "urn:oid:2.5.4.1"), - ASSOCIATED_DOMAIN("associatedDomain" , "urn:oid:0.9.2342.19200300.100.1.37"), - ASSOCIATED_NAME("associatedName" , "urn:oid:0.9.2342.19200300.100.1.38"), - AUDIO("audio" , "urn:oid:0.9.2342.19200300.100.1.55"), + ASSOCIATED_DOMAIN("associatedDomain" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.37"), + ASSOCIATED_NAME("associatedName" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.38"), + AUDIO("audio" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.55"), AUTHORITY_REVOCATION_LIST("authorityRevocationList" , "urn:oid:2.5.4.38"), - BINDING_NAME("buildingName" , "urn:oid:0.9.2342.19200300.100.1.48"), + BINDING_NAME("buildingName" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.48"), BUSINESS_CATEGORY("businessCategory" , "urn:oid:2.5.4.15"), C("c" , "urn:oid:2.5.4.6"), CA_CERTIFICATE("cACertificate" , "urn:oid:2.5.4.37"), - CNAME_RECORD("cNAMERecord" , "urn:oid:0.9.2342.19200300.100.1.31"), + CNAME_RECORD("cNAMERecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.31"), CAR_LICENSE("carLicense" , "urn:oid:2.16.840.1.113730.3.1.1"), CRL("certificateRevocationList" , "urn:oid:2.5.4.39"), CN("cn" , "urn:oid:2.5.4.3"), - CO("co" , "urn:oid:0.9.2342.19200300.100.1.43"), + CO("co" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.43"), COMMON_NAME("commonName" , "urn:oid:2.5.4.3"), COUNTRY_NAME("countryName" , "urn:oid:2.5.4.6"), CROSS_CERTIFICATE_PAIR("crossCertificatePair" , "urn:oid:2.5.4.40"), - D_IT_REDIRECT("dITRedirect" , "urn:oid:0.9.2342.19200300.100.1.54"), - D_SA_QUALITY("dSAQuality" , "urn:oid:0.9.2342.19200300.100.1.49"), - DC("dc" , "urn:oid:0.9.2342.19200300.100.1.25"), + D_IT_REDIRECT("dITRedirect" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.54"), + D_SA_QUALITY("dSAQuality" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.49"), + DC("dc" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.25"), DELTA_REVOCATION_LIST("deltaRevocationList" , "urn:oid:2.5.4.53"), DEPARTMENT_NUMBER("departmentNumber" , "urn:oid:2.16.840.1.113730.3.1.2"), DESCRIPTION("description" , "urn:oid:2.5.4.13"), @@ -63,14 +63,14 @@ DISTINGUISHED_NAME("distinguishedName" , "urn:oid:2.5.4.49"), DMD_NAME("dmdName" , "urn:oid:2.5.4.54"), DN_QUALIFIER("dnQualifier" , "urn:oid:2.5.4.46"), - DOCUMENT_AUTHOR("documentAuthor" , "urn:oid:0.9.2342.19200300.100.1.14"), - DOCUMENT_IDENTIFIER("documentIdentifier" , "urn:oid:0.9.2342.19200300.100.1.11"), - DOCUMENT_LOCATION("documentLocation" , "urn:oid:0.9.2342.19200300.100.1.15"), - DOCUMENT_PUBLISHER("documentPublisher" , "urn:oid:0.9.2342.19200300.100.1.56"), - DOCUMENT_TITLE("documentTitle" , "urn:oid:0.9.2342.19200300.100.1.12"), - DOCUMENT_VERSION("documentVersion" , "urn:oid:0.9.2342.19200300.100.1.13"), - DOMAIN_COMPONENT("domainComponent" , "urn:oid:0.9.2342.19200300.100.1.25"), - DRINK("drink" , "urn:oid:0.9.2342.19200300.100.1.5"), + DOCUMENT_AUTHOR("documentAuthor" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.14"), + DOCUMENT_IDENTIFIER("documentIdentifier" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.11"), + DOCUMENT_LOCATION("documentLocation" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.15"), + DOCUMENT_PUBLISHER("documentPublisher" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.56"), + DOCUMENT_TITLE("documentTitle" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.12"), + DOCUMENT_VERSION("documentVersion" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.13"), + DOMAIN_COMPONENT("domainComponent" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.25"), + DRINK("drink" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.5"), EDU_ORG_HOMEPAGEURI("eduOrgHomePageURI" , "urn:oid:1.3.6.1.4.1.5923.1.2.1.2"), EDU_ORG_IDENTITY_AUTHN_POLICYURI("eduOrgIdentityAuthNPolicyURI" , "urn:oid:1.3.6.1.4.1.5923.1.2.1.3"), EDU_ORG_LEGALNAME("eduOrgLegalName" , "urn:oid:1.3.6.1.4.1.5923.1.2.1.4"), @@ -92,37 +92,37 @@ EMPLOYEE_TYPE("employeeType" , "urn:oid:2.16.840.1.113730.3.1.4"), ENHANCED_SEARCH_GUIDE("enhancedSearchGuide" , "urn:oid:2.5.4.47"), FAX_TELEPHONE_NUMBER("facsimileTelephoneNumber" , "urn:oid:2.5.4.23"), - FAVORITE_DRINK("favouriteDrink" , "urn:oid:0.9.2342.19200300.100.1.5"), + FAVORITE_DRINK("favouriteDrink" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.5"), FAX("fax" , "urn:oid:2.5.4.23"), FEDERATION_FEIDE_SCHEMA_VERSION("federationFeideSchemaVersion" , "urn:oid:1.3.6.1.4.1.2428.90.1.9"), - FRIENDLY_COUNTRY_NAME("friendlyCountryName" , "urn:oid:0.9.2342.19200300.100.1.43"), + FRIENDLY_COUNTRY_NAME("friendlyCountryName" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.43"), GENERATION_QUALIFIER("generationQualifier" , "urn:oid:2.5.4.44"), GIVEN_NAME("givenName" , "urn:oid:2.5.4.42"), GN("gn" , "urn:oid:2.5.4.42"), - HOME_PHONE("homePhone" , "urn:oid:0.9.2342.19200300.100.1.20"), - HOME_POSTAL_ADDRESS("homePostalAddress" , "urn:oid:0.9.2342.19200300.100.1.39"), - HOME_TELEPHONE_NUMBER("homeTelephoneNumber" , "urn:oid:0.9.2342.19200300.100.1.20"), - HOST("host" , "urn:oid:0.9.2342.19200300.100.1.9"), + HOME_PHONE("homePhone" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.20"), + HOME_POSTAL_ADDRESS("homePostalAddress" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.39"), + HOME_TELEPHONE_NUMBER("homeTelephoneNumber" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.20"), + HOST("host" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.9"), HOUSE_IDENTIFIER("houseIdentifier" , "urn:oid:2.5.4.51"), - INFO("info" , "urn:oid:0.9.2342.19200300.100.1.4"), + INFO("info" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.4"), INITIALS("initials" , "urn:oid:2.5.4.43"), INTERNATIONAL_ISDN_NUMBER("internationaliSDNNumber" , "urn:oid:2.5.4.25"), IS_MEMBEROF("isMemberOf" , "urn:oid:1.3.6.1.4.1.5923.1.5.1.1"), - JANET_MAILBOX("janetMailbox" , "urn:oid:0.9.2342.19200300.100.1.46"), - JPEG_PHOTO("jpegPhoto" , "urn:oid:0.9.2342.19200300.100.1.60"), + JANET_MAILBOX("janetMailbox" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.46"), + JPEG_PHOTO("jpegPhoto" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.60"), KNOWLEDGE_INFORMATION("knowledgeInformation" , "urn:oid:2.5.4.2"), L("l" , "urn:oid:2.5.4.7"), LABELED_URI("labeledURI" , "urn:oid:1.3.6.1.4.1.250.1.57"), LOCALITY_NAME("localityName" , "urn:oid:2.5.4.7"), - M_DRECORD("mDRecord" , "urn:oid:0.9.2342.19200300.100.1.27"), - M_XRECORD("mXRecord" , "urn:oid:0.9.2342.19200300.100.1.28"), - MAIL("mail" , "urn:oid:0.9.2342.19200300.100.1.3"), - MAIL_PREFERENCEOPTION("mailPreferenceOption" , "urn:oid:0.9.2342.19200300.100.1.47"), - MANAGER("manager" , "urn:oid:0.9.2342.19200300.100.1.10"), + M_DRECORD("mDRecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.27"), + M_XRECORD("mXRecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.28"), + MAIL("mail" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"), + MAIL_PREFERENCEOPTION("mailPreferenceOption" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.47"), + MANAGER("manager" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.10"), MEMBER("member" , "urn:oid:2.5.4.31"), - MOBILE("mobile" , "urn:oid:0.9.2342.19200300.100.1.41"), - MOBILE_TELEPHONE_NUMBER("mobileTelephoneNumber" , "urn:oid:0.9.2342.19200300.100.1.41"), - N_SRECORD("nSRecord" , "urn:oid:0.9.2342.19200300.100.1.29"), + MOBILE("mobile" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.41"), + MOBILE_TELEPHONE_NUMBER("mobileTelephoneNumber" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.41"), + N_SRECORD("nSRecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.29"), NAME("name" , "urn:oid:2.5.4.41"), NOR_EDU_ORG_ACRONYM("norEduOrgAcronym" , "urn:oid:1.3.6.1.4.1.2428.90.1.6"), NOR_EDU_ORG_NIN("norEduOrgNIN" , "urn:oid:1.3.6.1.4.1.2428.90.1.12"), @@ -137,16 +137,16 @@ O("o" , "urn:oid:2.5.4.10"), OBJECT_CLASS("objectClass" , "urn:oid:2.5.4.0"), ORGANIZATION_NAME("organizationName" , "urn:oid:2.5.4.10"), - ORGANIZATIONAL_STATUS("organizationalStatus" , "urn:oid:0.9.2342.19200300.100.1.45"), + ORGANIZATIONAL_STATUS("organizationalStatus" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.45"), ORGANIZATIONAL_UNIT_NAME("organizationalUnitName" , "urn:oid:2.5.4.11"), - OTHER_MAIL_BOX("otherMailbox" , "urn:oid:0.9.2342.19200300.100.1.22"), + OTHER_MAIL_BOX("otherMailbox" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.22"), OU("ou" , "urn:oid:2.5.4.11"), OWNER("owner" , "urn:oid:2.5.4.32"), - PAGER("pager" , "urn:oid:0.9.2342.19200300.100.1.42"), - PAGER_TELEPHONE_NUMBER("pagerTelephoneNumber" , "urn:oid:0.9.2342.19200300.100.1.42"), - PERSONAL_SIGNATURE("personalSignature" , "urn:oid:0.9.2342.19200300.100.1.53"), - PERSONAL_TITLE("personalTitle" , "urn:oid:0.9.2342.19200300.100.1.40"), - PHOTO("photo" , "urn:oid:0.9.2342.19200300.100.1.7"), + PAGER("pager" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.42"), + PAGER_TELEPHONE_NUMBER("pagerTelephoneNumber" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.42"), + PERSONAL_SIGNATURE("personalSignature" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.53"), + PERSONAL_TITLE("personalTitle" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.40"), + PHOTO("photo" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.7"), PHYSICAL_DELIVERY_OFFICE_NAME("physicalDeliveryOfficeName" , "urn:oid:2.5.4.19"), PKCS_9_EMAIL("pkcs9email" , "urn:oid:1.2.840.113549.1.9.1"), POST_OFFICE_BOX("postOfficeBox" , "urn:oid:2.5.4.18"), @@ -158,39 +158,39 @@ PROTOCOL_INFORMATION("protocolInformation" , "urn:oid:2.5.4.48"), PSEUDONYM("pseudonym" , "urn:oid:2.5.4.65"), REGISTERED_ADDRESS("registeredAddress" , "urn:oid:2.5.4.26"), - RFC_822_MAILBOX("rfc822Mailbox" , "urn:oid:0.9.2342.19200300.100.1.3"), + RFC_822_MAILBOX("rfc822Mailbox" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"), ROLE_OCCUPANT("roleOccupant" , "urn:oid:2.5.4.33"), - ROOM_NUMBER("roomNumber" , "urn:oid:0.9.2342.19200300.100.1.6"), - S_OAR_RECORD("sOARecord" , "urn:oid:0.9.2342.19200300.100.1.30"), + ROOM_NUMBER("roomNumber" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.6"), + S_OAR_RECORD("sOARecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.30"), SEARCH_GUIDE("searchGuide" , "urn:oid:2.5.4.14"), - SECRETARY("secretary" , "urn:oid:0.9.2342.19200300.100.1.21"), + SECRETARY("secretary" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.21"), SEE_ALSO("seeAlso" , "urn:oid:2.5.4.34"), SERIAL_NUMBER("serialNumber" , "urn:oid:2.5.4.5"), - SINGLE_LEVEL_QUALITY("singleLevelQuality" , "urn:oid:0.9.2342.19200300.100.1.50"), + SINGLE_LEVEL_QUALITY("singleLevelQuality" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.50"), SN("sn" , "urn:oid:2.5.4.4"), ST("st" , "urn:oid:2.5.4.8"), STATE_OR_PROVINCE_NAME("stateOrProvinceName" , "urn:oid:2.5.4.8"), STREET("street" , "urn:oid:2.5.4.9"), STREET_ADDRESS("streetAddress" , "urn:oid:2.5.4.9"), - SUBTREE_MAXIMUM_QUALITY("subtreeMaximumQuality" , "urn:oid:0.9.2342.19200300.100.1.52"), - SUBTREE_MINIMUM_QUALITY("subtreeMinimumQuality" , "urn:oid:0.9.2342.19200300.100.1.51"), + SUBTREE_MAXIMUM_QUALITY("subtreeMaximumQuality" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.52"), + SUBTREE_MINIMUM_QUALITY("subtreeMinimumQuality" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.51"), SUPPORTED_ALGORITHMS("supportedAlgorithms" , "urn:oid:2.5.4.52"), SUPPORTED_APPLICATION_CONTEXT("supportedApplicationContext" , "urn:oid:2.5.4.30"), SURNAME("surname" , "urn:oid:2.5.4.4"), TELEPHONE_NUMBER("telephoneNumber" , "urn:oid:2.5.4.20"), TELETEX_TERMINAL_IDENTIFIER("teletexTerminalIdentifier" , "urn:oid:2.5.4.22"), TELEX_NUMBER("telexNumber" , "urn:oid:2.5.4.21"), - TEXT_ENCODED_OR_ADDRESS("textEncodedORAddress" , "urn:oid:0.9.2342.19200300.100.1.2"), + TEXT_ENCODED_OR_ADDRESS("textEncodedORAddress" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.2"), TITLE("title" , "urn:oid:2.5.4.12"), - UID("uid" , "urn:oid:0.9.2342.19200300.100.1.1"), - UNIQUE_IDENTIFIER("uniqueIdentifier" , "urn:oid:0.9.2342.19200300.100.1.44"), + UID("uid" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"), + UNIQUE_IDENTIFIER("uniqueIdentifier" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.44"), UNIQUE_MEMBER("uniqueMember" , "urn:oid:2.5.4.50"), USER_CERTIFICATE("userCertificate" , "urn:oid:2.5.4.36"), - USER_CLASS("userClass" , "urn:oid:0.9.2342.19200300.100.1.8"), + USER_CLASS("userClass" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.8"), USER_PKCS12("userPKCS12" , "urn:oid:2.16.840.1.113730.3.1.216"), USER_PASSWORD("userPassword" , "urn:oid:2.5.4.35"), USER_SMIME_CERTIFICATE("userSMIMECertificate" , "urn:oid:2.16.840.1.113730.3.1.40"), - USERID("userid" , "urn:oid:0.9.2342.19200300.100.1.1"), + USERID("userid" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"), X121_ADDRESS("x121Address" , "urn:oid:2.5.4.24"), X500_UNIQUE_IDENTIFIER("x500UniqueIdentifier" , "urn:oid:2.5.4.45"); Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -59,7 +59,7 @@ //XML DSIG schemaLocationMap.put("http://www.w3.org/2000/09/xmldsig#";, "schema/w3c/xmldsig/xmldsig-core-schema.xsd"); - schemaLocationMap.put("http://www.w3.org/TR/2002/REC-xmldsig-core-20...;, + schemaLocationMap.put("http://www.w3.org/TR/2002/REC-xmldsig-core-2....;, "schema/w3c/xmldsig/xmldsig-core-schema.xsd"); //XML Enc @@ -98,10 +98,10 @@ //WS-T schemaLocationMap.put("http://docs.oasis-open.org/ws-sx/ws-trust/200...;, "schema/wstrust/v1_3/ws-trust-1.3.xsd"); - schemaLocationMap.put("http://docs.oasis-open.org/wss/2004/01/oasis-...;, - "schema/wstrust/v1_3/oasis-200401-wss-wssecurity-secext-1.0.xsd"); - schemaLocationMap.put("http://docs.oasis-open.org/wss/2004/01/oasis-...;, - "schema/wstrust/v1_3/oasis-200401-wss-wssecurity-utility-1.0.xsd"); + schemaLocationMap.put("http://docs.oasis-open.org/wss/2004/01/oasis-...;, + "schema/wstrust/v1_3/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd"); + schemaLocationMap.put("http://docs.oasis-open.org/wss/2004/01/oasis-...;, + "schema/wstrust/v1_3/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd"); schemaLocationMap.put("http://schemas.xmlsoap.org/ws/2004/09/policy&...;, "schema/wstrust/v1_3/ws-policy.xsd"); schemaLocationMap.put("http://www.w3.org/2005/08/addressing";, "schema/wstrust/v1_3/ws-addr.xsd"); } Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/SchemaManagerUtil.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/SchemaManagerUtil.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/SchemaManagerUtil.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -95,8 +95,8 @@ List<String> list = new ArrayList<String>(); list.add("schema/wstrust/v1_3/ws-trust-1.3.xsd"); - list.add("schema/wstrust/v1_3/oasis-200401-wss-wssecurity-secext-1.0.xsd"); - list.add("schema/wstrust/v1_3/oasis-200401-wss-wssecurity-utility-1.0.xsd"); + list.add("schema/wstrust/v1_3/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd"); + list.add("schema/wstrust/v1_3/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd"); list.add("schema/wstrust/v1_3/ws-policy.xsd"); list.add("schema/wstrust/v1_3/ws-addr.xsd"); return list; Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wsse/WSSecurityConstants.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wsse/WSSecurityConstants.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wsse/WSSecurityConstants.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -33,7 +33,7 @@ String USERNAME_TOKEN = "UsernameToken"; String WSSE_PREFIX = "wsse"; String WSU_PREFIX = "wsu"; - String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"; + String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd"; String WSSE11_NS = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd"; - String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"; + String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd"; } Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -79,9 +79,9 @@ String WSP_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy"; - String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"; + String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd"; - String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"; + String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd"; String WSSE11_NS = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd"; Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/policy/Policy.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/policy/Policy.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/policy/Policy.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -37,7 +37,7 @@ * &lt;complexContent> * &lt;extension base="{http://schemas.xmlsoap.org/ws/2004/09/policy}OperatorContentT... * &lt;attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> - * &lt;attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecu... + * &lt;attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-w... * &lt;/extension> * &lt;/complexContent> * &lt;/complexType> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/LifetimeType.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/LifetimeType.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/LifetimeType.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -33,8 +33,8 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecu... minOccurs="0"/> - * &lt;element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecu... minOccurs="0"/> + * &lt;element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-w... minOccurs="0"/> + * &lt;element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-w... minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/RequestedReferenceType.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/RequestedReferenceType.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/RequestedReferenceType.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -33,7 +33,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecu... + * &lt;element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-w... * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/AttributedString.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/AttributedString.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/AttributedString.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -34,7 +34,7 @@ * &lt;complexType name="AttributedString"> * &lt;simpleContent> * &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string"> - * &lt;attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecu... + * &lt;attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-w... * &lt;/extension> * &lt;/simpleContent> * &lt;/complexType> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/BinarySecurityTokenType.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/BinarySecurityTokenType.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/BinarySecurityTokenType.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -31,7 +31,7 @@ * <pre> * &lt;complexType name="BinarySecurityTokenType"> * &lt;simpleContent> - * &lt;extension base="&lt;http://docs.oasis-open.org/wss/2004/01/oasis-200401-ws... + * &lt;extension base="&lt;http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNA... * &lt;attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> * &lt;/extension> * &lt;/simpleContent> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/EncodedString.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/EncodedString.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/EncodedString.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -31,7 +31,7 @@ * <pre> * &lt;complexType name="EncodedString"> * &lt;simpleContent> - * &lt;extension base="&lt;http://docs.oasis-open.org/wss/2004/01/oasis-200401-ws... + * &lt;extension base="&lt;http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNA... * &lt;attribute name="EncodingType" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> * &lt;/extension> * &lt;/simpleContent> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/KeyIdentifierType.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/KeyIdentifierType.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/KeyIdentifierType.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -31,7 +31,7 @@ * <pre> * &lt;complexType name="KeyIdentifierType"> * &lt;simpleContent> - * &lt;extension base="&lt;http://docs.oasis-open.org/wss/2004/01/oasis-200401-ws... + * &lt;extension base="&lt;http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNA... * &lt;attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> * &lt;/extension> * &lt;/simpleContent> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/PasswordString.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/PasswordString.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/PasswordString.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -31,7 +31,7 @@ * <pre> * &lt;complexType name="PasswordString"> * &lt;simpleContent> - * &lt;extension base="&lt;http://docs.oasis-open.org/wss/2004/01/oasis-200401-ws... + * &lt;extension base="&lt;http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNA... * &lt;attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> * &lt;/extension> * &lt;/simpleContent> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/SecurityTokenReferenceType.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/SecurityTokenReferenceType.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/SecurityTokenReferenceType.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -41,8 +41,8 @@ * &lt;choice maxOccurs="unbounded" minOccurs="0"> * &lt;any/> * &lt;/choice> - * &lt;attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecu... - * &lt;attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecu... + * &lt;attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-w... + * &lt;attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-w... * &lt;/restriction> * &lt;/complexContent> * &lt;/complexType> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/UsernameTokenType.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/UsernameTokenType.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/UsernameTokenType.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -35,10 +35,10 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="Username" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssec... + * &lt;element name="Username" type="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-... * &lt;any/> * &lt;/sequence> - * &lt;attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecu... + * &lt;attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-w... * &lt;/restriction> * &lt;/complexContent> * &lt;/complexType> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -36,7 +36,7 @@ * &lt;complexType name="AttributedDateTime"> * &lt;simpleContent> * &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string"> - * &lt;attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecu... + * &lt;attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-w... * &lt;/extension> * &lt;/simpleContent> * &lt;/complexType> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -36,7 +36,7 @@ * &lt;complexType name="AttributedURI"> * &lt;simpleContent> * &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>anyURI"> - * &lt;attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecu... + * &lt;attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-w... * &lt;/extension> * &lt;/simpleContent> * &lt;/complexType> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -37,13 +37,13 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecu... minOccurs="0"/> - * &lt;element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecu... minOccurs="0"/> + * &lt;element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-w... minOccurs="0"/> + * &lt;element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-w... minOccurs="0"/> * &lt;choice maxOccurs="unbounded" minOccurs="0"> * &lt;any/> * &lt;/choice> * &lt;/sequence> - * &lt;attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecu... + * &lt;attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-w... * &lt;/restriction> * &lt;/complexContent> * &lt;/complexType> Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/Constants.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/Constants.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/Constants.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -31,20 +31,20 @@ */ public class Constants { - public static final String WSS_SOAP_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0"; + public static final String WSS_SOAP_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-soap-message-security-1.0"; public static final String WSSE_LOCAL = "Security"; public static final String WSSE_PREFIX = "wsse"; - public static final String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"; + public static final String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd"; public static final String WSSE_BINARY_SECURITY_TOKEN = "BinarySecurityToken"; public static final String WSSE_USERNAME_TOKEN = "UsernameToken"; public static final String WSSE_USERNAME = "Username"; public static final String WSSE_PASSWORD = "Password"; - public static final String WSSE_PASSWORD_TEXT_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0#PasswordText"; + public static final String WSSE_PASSWORD_TEXT_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0#PasswordText"; public static final String WSSE_ENCODING_TYPE = "EncodingType"; @@ -52,7 +52,7 @@ public static final String WSU_PREFIX = "wsu"; - public static final String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"; + public static final String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd"; public static final String XML_SIGNATURE_NS = org.apache.xml.security.utils.Constants.SignatureSpecNS; @@ -66,9 +66,9 @@ public static final String BASE64_ENCODING_TYPE = WSS_SOAP_NS + "#Base64Binary"; - public static final String PASSWORD_TEXT_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText"; + public static final String PASSWORD_TEXT_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-username-token-profile-1.0#PasswordText"; - public static final String PASSWORD_DIGEST_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest"; + public static final String PASSWORD_DIGEST_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-username-token-profile-1.0#PasswordDigest"; public static final String WSSE_HEADER = WSSE_PREFIX + ":Security"; Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -93,7 +93,7 @@ * Attribute value for the EncodingType attribute */ private String encodingType = SecurityActions.getSystemProperty("binary.http.encodingType", - "http://docs.oasis-open.org/wss/2004/01/ oasis-200401-wss-soap-message-security-1.0#Base64Binary"); + "http://docs.oasis-open.org/wss/2004/01/ oasis-2.0.1-SNAPSHOT1-wss-soap-message-security-1.0#Base64Binary"); /** * Attribute value for the ValueType attribute Modified: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/api/util/KeyUtilUnitTestCase.java =================================================================== --- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/api/util/KeyUtilUnitTestCase.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/api/util/KeyUtilUnitTestCase.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -47,7 +47,7 @@ -keypass test123 -keystore jbid_test_keystore.jks -storepass store123 - -validity 200000 + -validity 2.0.1-SNAPSHOT0 */ private String keystoreLocation = "keystore/jbid_test_keystore.jks"; private String keystorePass = "store123"; Modified: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java =================================================================== --- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -47,7 +47,7 @@ Object object = this.unmarshall(config + "1.xml"); assertNotNull("IDP is not null", object); IDPType idp = (IDPType) object; - assertEquals("20000", 20000L, idp.getAssertionValidity()); + assertEquals("2.0.1-SNAPSHOT", 2.0.1-SNAPSHOTL, idp.getAssertionValidity()); assertEquals("somefqn", idp.getRoleGenerator()); TrustType trust = idp.getTrust(); Modified: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/config/ConfigUnitTestCase.java =================================================================== --- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/config/ConfigUnitTestCase.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/config/ConfigUnitTestCase.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -83,7 +83,7 @@ assertNotNull("IDP is not null", object); IDPType idp = (IDPType) object; - assertEquals("20000", 20000L, idp.getAssertionValidity()); + assertEquals("2.0.1-SNAPSHOT", 2.0.1-SNAPSHOTL, idp.getAssertionValidity()); assertEquals("somefqn", idp.getRoleGenerator()); assertTrue(idp.isEncrypt()); assertEquals( CanonicalizationMethod.EXCLUSIVE , idp.getCanonicalizationMethod() ); Modified: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/util/KeystoreUtilUnitTestCase.java =================================================================== --- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/util/KeystoreUtilUnitTestCase.java 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/util/KeystoreUtilUnitTestCase.java 2011-08-11 22:40:00 UTC (rev 1189) @@ -50,7 +50,7 @@ -keypass test123 -keystore jbid_test_keystore.jks -storepass store123 - -validity 200000 + -validity 2.0.1-SNAPSHOT0 */ private String keystoreLocation = "keystore/jbid_test_keystore.jks"; private String keystorePass = "store123"; Modified: product/trunk/picketlink-core/src/test/resources/config/test-config-2.xml =================================================================== --- product/trunk/picketlink-core/src/test/resources/config/test-config-2.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/resources/config/test-config-2.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -1,5 +1,5 @@ <PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" - AssertionValidity="20000" + AssertionValidity="2.0.1-SNAPSHOT" RoleGenerator="somefqn" Encrypt="true" CanonicalizationMethod="http://www.w3.org/2001/10/xml-exc-c14n#"... Modified: product/trunk/picketlink-core/src/test/resources/config/test-metadata-config-1.xml =================================================================== --- product/trunk/picketlink-core/src/test/resources/config/test-metadata-config-1.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/resources/config/test-metadata-config-1.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -1,5 +1,5 @@ <PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" - AssertionValidity="20000" + AssertionValidity="2.0.1-SNAPSHOT" RoleGenerator="somefqn" Encrypt="true"> <IdentityURL>http://localhost:8080/idp</IdentityURL> Modified: product/trunk/picketlink-core/src/test/resources/jbossws/xml/wsse-saml.xml =================================================================== --- product/trunk/picketlink-core/src/test/resources/jbossws/xml/wsse-saml.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/resources/jbossws/xml/wsse-saml.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -2,7 +2,7 @@ " + <env:Header> <wsse:Security - xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSH... <saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:2.0:assertion' xmlns='urn:oasis:names:tc:SAML:2.0:assertion' ID='ID_7069926b-792e-4f90-8727-0e16ec9c3073' IssueInstant='2011-07-13T00:16:13.990Z' Version='2.0'> Modified: product/trunk/picketlink-core/src/test/resources/parser/saml2/saml2-authnrequest.xml =================================================================== --- product/trunk/picketlink-core/src/test/resources/parser/saml2/saml2-authnrequest.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/resources/parser/saml2/saml2-authnrequest.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -17,7 +17,7 @@ <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"> <SignedInfo> <CanonicalizationMethod - Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComme... /> + Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-2.0.1-SNAPSHOT315#... /> <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1" /> <Reference URI="#ccocfkmlnocbajegpiheahonbcambbapiibggije"> Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-issue-onbehalfof.xml =================================================================== --- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-issue-onbehalfof.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-issue-onbehalfof.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -2,8 +2,8 @@ <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Issue... <wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-prof... <wst:OnBehalfOf> - <wsse:UsernameToken wsu:Id="id" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-... - xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + <wsse:UsernameToken wsu:Id="id" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPS... + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSH... <wsse:Username>anotherduke</wsse:Username> </wsse:UsernameToken> </wst:OnBehalfOf> Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-certificate.xml =================================================================== --- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-certificate.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-certificate.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -1,4 +1,4 @@ -<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... +<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSH... <wst:RequestSecurityTokenResponse Context="testcontext"> <wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-prof... <wst:Lifetime> @@ -68,7 +68,7 @@ </saml2:Assertion> </wst:RequestedSecurityToken> <wst:RequestedAttachedReference> - <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-se... wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-toke... xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-... + <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-se... wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-toke... xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPS... <wsse:KeyIdentifier ValueType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profi... #ID_5a15fc70-daa1-4808-b70e-9cbf6b8e4d4f </wsse:KeyIdentifier> Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-combined.xml =================================================================== --- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-combined.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-combined.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -1,4 +1,4 @@ -<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... +<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSH... <wst:RequestSecurityTokenResponse Context="testcontext"> <wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-prof... <wst:Lifetime> @@ -76,7 +76,7 @@ <wst:BinarySecret Type="http://docs.oasis-open.org/ws-sx/ws-trust/200512/Nonce"&g... </wst:Entropy> <wst:RequestedAttachedReference> - <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-se... wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-toke... xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-... + <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-se... wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-toke... xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPS... <wsse:KeyIdentifier ValueType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profi... #ID_17a5f8b6-0c74-4df8-993d-ff51f00c57c7 </wsse:KeyIdentifier> Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-pubkey.xml =================================================================== --- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-pubkey.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-pubkey.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -1,4 +1,4 @@ -<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... +<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSH... <wst:RequestSecurityTokenResponse Context="testcontext"> <wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-prof... <wst:Lifetime> @@ -71,7 +71,7 @@ </saml2:Assertion> </wst:RequestedSecurityToken> <wst:RequestedAttachedReference> - <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-se... wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-toke... xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-... + <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-se... wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-toke... xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPS... <wsse:KeyIdentifier ValueType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profi... #ID_22727062-ce90-44d3-a870-823ec0d69809 </wsse:KeyIdentifier> Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-simmetric.xml =================================================================== --- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-simmetric.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-simmetric.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -1,4 +1,4 @@ -<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... +<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSH... <wst:RequestSecurityTokenResponse Context="testcontext"> <wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-prof... <wst:Lifetime> @@ -76,7 +76,7 @@ <wst:BinarySecret Type="http://docs.oasis-open.org/ws-sx/ws-trust/200512/Nonce"&g... </wst:Entropy> <wst:RequestedAttachedReference> - <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-se... wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-toke... xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-... + <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-se... wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-toke... xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPS... <wsse:KeyIdentifier ValueType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profi... #ID_5cc7fe71-7d76-4615-93d7-6ecfb1e63aae </wsse:KeyIdentifier> Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion.xml =================================================================== --- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -1,4 +1,4 @@ -<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... +<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSH... <wst:RequestSecurityTokenResponse Context="testcontext"> <wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-prof... <wst:Lifetime> Modified: product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestExample.xml =================================================================== (Binary files differ) Modified: product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestWithSignature.xml =================================================================== --- product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestWithSignature.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestWithSignature.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -15,7 +15,7 @@ <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"> <SignedInfo> <CanonicalizationMethod - Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComme... /> + Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-2.0.1-SNAPSHOT315#... /> <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1" /> <Reference URI="#ccocfkmlnocbajegpiheahonbcambbapiibggije"> Modified: product/trunk/picketlink-core/src/test/resources/saml2/metadata/sp-entitydescriptor.xml =================================================================== --- product/trunk/picketlink-core/src/test/resources/saml2/metadata/sp-entitydescriptor.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/resources/saml2/metadata/sp-entitydescriptor.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -50,7 +50,7 @@ <md:ServiceName xml:lang="en">Sample Service</md:ServiceName> <md:ServiceDescription xml:lang="en">An example service that requires a human-readable identifier and optional name and e-mail address.</md:ServiceDescription> <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> - <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/> + <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/> <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/> </md:AttributeConsumingService> Modified: product/trunk/picketlink-core/src/test/resources/saml2/metadata/testshib-two-metadata.xml =================================================================== --- product/trunk/picketlink-core/src/test/resources/saml2/metadata/testshib-two-metadata.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-core/src/test/resources/saml2/metadata/testshib-two-metadata.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -53714,7 +53714,7 @@ BgEFBQcDATAdBgNVHQ4EFgQUboCxFapQWR+9Kpjxit7D6Oaz9igwgcYGA1UdIwSBvjCBu4AUGgIJ hfBzUtNt18QAT2T448a5OBihgZukgZgwgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5p YyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFAMD4G -A1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0Eg +A1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb2.0.1-SNAPSHOTEg MjAwNoIFAQAAAA4wFwYDVR0RBBAwDoEMYWRtaW5AZWt0LmdyMBcGA1UdEgQQMA6BDGNhQGhhcmlj YS5ncjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLmhhcmljYS5nci8w RQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL2NybHYxLmhhcmljYS5nci9IYXJpY2FFS1RDQTIwMDgv @@ -53772,7 +53772,7 @@ BgEFBQcDATAdBgNVHQ4EFgQUboCxFapQWR+9Kpjxit7D6Oaz9igwgcYGA1UdIwSBvjCBu4AUGgIJ hfBzUtNt18QAT2T448a5OBihgZukgZgwgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5p YyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFAMD4G -A1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0Eg +A1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb2.0.1-SNAPSHOTEg MjAwNoIFAQAAAA4wFwYDVR0RBBAwDoEMYWRtaW5AZWt0LmdyMBcGA1UdEgQQMA6BDGNhQGhhcmlj YS5ncjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLmhhcmljYS5nci8w RQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL2NybHYxLmhhcmljYS5nci9IYXJpY2FFS1RDQTIwMDgv @@ -70554,7 +70554,7 @@ MRkwFwYDVQQDExBpZHAuYmFybmV0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC AQEA15UdvpIRLL49uj68oeUDwuyf7fjkXW8IrdkXaEtThHYzX9+Z+1JDIeDsSY2GwlXCBWtsCl8r kXkgzqf1ZXxp1QrSi2VYllI/X4NfhIBJ0PhxPQl0dIhD4OJ8oFpciutGrKbEkdPe82Vnmpro6qDi -F++FXFfPpUyaJy18e4C2n0u0YtaVPGycljzTVYbUMCGuFjHeYhc8qUZKofEyGmWIrvHZbG0LVrTQ +F++FXFfPpUyaJy18e4C2.0.1-SNAPSHOTYtaVPGycljzTVYbUMCGuFjHeYhc8qUZKofEyGmWIrvHZbG0LVrTQ 0aggjskhzDV5hEyNLSoyeUj+a/bESgBhznBdYXYahS1WPaztrjKv9xd7+YhFPS4oxn/VgaGzNNoz D373L1JHPxgTQ2lbnW977mAHEma1NIF4SbLWb0OLLQIDAQABo2cwZTBEBgNVHREEPTA7ghBpZHAu YmFybmV0LmFjLnVrhidodHRwczovL2lkcC5iYXJuZXQuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD @@ -70597,7 +70597,7 @@ MRkwFwYDVQQDExBpZHAuYmFybmV0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC AQEA15UdvpIRLL49uj68oeUDwuyf7fjkXW8IrdkXaEtThHYzX9+Z+1JDIeDsSY2GwlXCBWtsCl8r kXkgzqf1ZXxp1QrSi2VYllI/X4NfhIBJ0PhxPQl0dIhD4OJ8oFpciutGrKbEkdPe82Vnmpro6qDi -F++FXFfPpUyaJy18e4C2n0u0YtaVPGycljzTVYbUMCGuFjHeYhc8qUZKofEyGmWIrvHZbG0LVrTQ +F++FXFfPpUyaJy18e4C2.0.1-SNAPSHOTYtaVPGycljzTVYbUMCGuFjHeYhc8qUZKofEyGmWIrvHZbG0LVrTQ 0aggjskhzDV5hEyNLSoyeUj+a/bESgBhznBdYXYahS1WPaztrjKv9xd7+YhFPS4oxn/VgaGzNNoz D373L1JHPxgTQ2lbnW977mAHEma1NIF4SbLWb0OLLQIDAQABo2cwZTBEBgNVHREEPTA7ghBpZHAu YmFybmV0LmFjLnVrhidodHRwczovL2lkcC5iYXJuZXQuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD @@ -75214,7 +75214,7 @@ mflY4DVSQuOTr1zc97giEI7gic2k+EiqKKEXVMcIZpgD6Sxr0Hc/mhb9sZPE8OAR7/E6FFGW4TyP iaPUe4disgyavlrDSsDx+zUg+Kb4dshYk0YB0B7rnAXqe4NZKEq/eWXtVhNRRQvvqZ+1B584a/MG qg5/dZLlvCJ49AgU26r53ESfe4cXB2bzrC8MalO6o30ZMG3sPJs2taBMShbKU8WnvIHEZ90jnUcI -r0IrkC2zT2AAqkwqbk9KvO42f0f01Mhxqq0SZjHjYvYFmN8ctwIDAQABo20wazBKBgNVHREEQzBB +r0IrkC2zT2AAqkwqbk9KvO42.0.1-SNAPSHOT1Mhxqq0SZjHjYvYFmN8ctwIDAQABo20wazBKBgNVHREEQzBB ghNub2RlMy5mdWxsZXJ0b24uZWR1hipodHRwczovL25vZGUzLmZ1bGxlcnRvbi5lZHUvaWRwL3No aWJib2xldGgwHQYDVR0OBBYEFKU11sg+lw4YIBAp2VltcZrbxCSsMA0GCSqGSIb3DQEBBQUAA4IB AQAWMfxPSNaEfYnYjbkQV3YOU9Lpp3wrHoe6p66rUWQrZlN1EAPqQ6q/0OawSB3+TscXvi18rp0W @@ -75257,7 +75257,7 @@ mflY4DVSQuOTr1zc97giEI7gic2k+EiqKKEXVMcIZpgD6Sxr0Hc/mhb9sZPE8OAR7/E6FFGW4TyP iaPUe4disgyavlrDSsDx+zUg+Kb4dshYk0YB0B7rnAXqe4NZKEq/eWXtVhNRRQvvqZ+1B584a/MG qg5/dZLlvCJ49AgU26r53ESfe4cXB2bzrC8MalO6o30ZMG3sPJs2taBMShbKU8WnvIHEZ90jnUcI -r0IrkC2zT2AAqkwqbk9KvO42f0f01Mhxqq0SZjHjYvYFmN8ctwIDAQABo20wazBKBgNVHREEQzBB +r0IrkC2zT2AAqkwqbk9KvO42.0.1-SNAPSHOT1Mhxqq0SZjHjYvYFmN8ctwIDAQABo20wazBKBgNVHREEQzBB ghNub2RlMy5mdWxsZXJ0b24uZWR1hipodHRwczovL25vZGUzLmZ1bGxlcnRvbi5lZHUvaWRwL3No aWJib2xldGgwHQYDVR0OBBYEFKU11sg+lw4YIBAp2VltcZrbxCSsMA0GCSqGSIb3DQEBBQUAA4IB AQAWMfxPSNaEfYnYjbkQV3YOU9Lpp3wrHoe6p66rUWQrZlN1EAPqQ6q/0OawSB3+TscXvi18rp0W @@ -82834,7 +82834,7 @@ dGUuZXMubmV0MB4XDTA5MDYwOTIyMzk0NFoXDTE5MDYwNzIyMzk0NFowGTEXMBUGA1UEAxMOY2Fs Y2l0ZS5lcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCBQC1W5oWupg1MPHJ oZm9n41mTu9l3bcRG7jL35m16QxvQXYhmXQrf6x0fQFFBTDFyMfGKyaY9pgP0rnHl8qddCnjoLdN -twSvQQpCUQo26J4UeDFH6Xkm2PSHKQ0TVY5ZtknaC+htkSQ2LRSVCSPtRU6rsVFhF2O0E0Lc1U3m +twSvQQpCUQo26J4UeDFH6Xkm2PSHKQ0TVY5ZtknaC+htkSQ2LRSVCSPtRU6rsVFhF2.0.1-SNAPSHOTLc1U3m +yZyeRqROydJgtBhS1sawxKwVXKHH6MNJA10qCZUUbVV5DivKgX8OSNPUPPNqzc6r3MLvZwemQ5b Uqv7jxQSx70r8GIcSXLWmm85KbYFVXw5HnwGZmzS620HjLjC920WdpBVd4hS1f2ACk0bWDI1F1Or fTxKbXERQntMM6lBFIQfAgMBAAGjPDA6MBkGA1UdEQQSMBCCDmNhbGNpdGUuZXMubmV0MB0GA1Ud @@ -95008,10 +95008,10 @@ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute - Name="urn:oid:0.9.2342.19200300.100.1.1" + Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute - Name="urn:oid:0.9.2342.19200300.100.1.3" + Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute Name="dk:gov:saml:attribute:AssuranceLevel" @@ -118757,10 +118757,10 @@ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute - Name="urn:oid:0.9.2342.19200300.100.1.1" + Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute - Name="urn:oid:0.9.2342.19200300.100.1.3" + Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute Name="dk:gov:saml:attribute:AssuranceLevel" @@ -119495,7 +119495,7 @@ DI1SWNrvvn7KV0YWg8SBq9wUmoibxvDc3MCGBlwBNYzprDxKpQIDAQABo0cwRTAkBgNVHREEHTAb ghl3bWxpMDE2NjY5Lmdyb3VwaW5mcmEuY29tMB0GA1UdDgQWBBSTn8Vl1m7FcQodPsV48pFarOJi rjANBgkqhkiG9w0BAQUFAAOCAQEAIyXJOAGmjgZUn81e7znwS14dPAGBQ8DXzcKNiZgDZqsfa+zF -RYQHVvTxHApBKBLNhB2O0ynsZAl+vy2Ss2E0b0atjfu3VBuIf/31s6WffSPVUAowFzyVjTgjaGgC +RYQHVvTxHApBKBLNhB2O0ynsZAl+vy2Ss2.0.1-SNAPSHOTatjfu3VBuIf/31s6WffSPVUAowFzyVjTgjaGgC UxrEvJywXr6u5V00AbF6GbFgma3V6lFdpOytKuka0oy+3w1LeVi0sQgXT/2ncXJ3OTEZAcvYZK3D k7E7juNXLLY+hGdLOY80sn1FwBXU5SRfnG67dQnTdFOwPd6k7X/AJ4I7XcCaHJ/9Kuz6f1d7sVD+ skNmcwhlijpHKiV+gNiUSYEFoKHWtm75MWOIjMFPo/gil9oePBd3AZgulzSZEmcY6g== @@ -145297,10 +145297,10 @@ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute - Name="urn:oid:0.9.2342.19200300.100.1.1" + Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute - Name="urn:oid:0.9.2342.19200300.100.1.3" + Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute Name="dk:gov:saml:attribute:AssuranceLevel" @@ -151270,7 +151270,7 @@ AQUAA4IBDwAwggEKAoIBAQCXXyo9YN+9JiDyUzpAcXh2zxBxpEu6sj05TAUBTP1Irpm3PcqXwwUJ 0UEmuzMW4Bd/48vyMCcKUqe56J94B3LTquqK3D4y3gK0FblmpS+yJhcLZzWku0tRaVnWZh/NP9US kQjFkeCGiBL3JeR+RoENHrQpTT/iI8XvWrrekYLYBC4NFVF81JPYc17ZxpMO3vgucIr+VRSAFUOY -zTqD4IKSvqsNm2u1ueO4/UxNCY/Yj5ulG82W0T03jhbai0LqLETujPEQ2bemZqNUNHxdtgvU5yDA +zTqD4IKSvqsNm2u1ueO4/UxNCY/Yj5ulG82.0.1-SNAPSHOT3jhbai0LqLETujPEQ2bemZqNUNHxdtgvU5yDA H0AHv7RzW4Kx2v+qKpTDAvRd5JvERQa4P9DWjYRAzHjz0TK9pdE6nMz0hEXpAgMBAAGjdTBzMFIG A1UdEQRLMEmCF3NoaWJib2xldGguY29jb25pbm8uZWR1hi5odHRwczovL3NoaWJib2xldGguY29j b25pbm8uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRf5ApSnXQFJpysLJcHKJAtjvCgLzAN @@ -151313,7 +151313,7 @@ AQUAA4IBDwAwggEKAoIBAQCXXyo9YN+9JiDyUzpAcXh2zxBxpEu6sj05TAUBTP1Irpm3PcqXwwUJ 0UEmuzMW4Bd/48vyMCcKUqe56J94B3LTquqK3D4y3gK0FblmpS+yJhcLZzWku0tRaVnWZh/NP9US kQjFkeCGiBL3JeR+RoENHrQpTT/iI8XvWrrekYLYBC4NFVF81JPYc17ZxpMO3vgucIr+VRSAFUOY -zTqD4IKSvqsNm2u1ueO4/UxNCY/Yj5ulG82W0T03jhbai0LqLETujPEQ2bemZqNUNHxdtgvU5yDA +zTqD4IKSvqsNm2u1ueO4/UxNCY/Yj5ulG82.0.1-SNAPSHOT3jhbai0LqLETujPEQ2bemZqNUNHxdtgvU5yDA H0AHv7RzW4Kx2v+qKpTDAvRd5JvERQa4P9DWjYRAzHjz0TK9pdE6nMz0hEXpAgMBAAGjdTBzMFIG A1UdEQRLMEmCF3NoaWJib2xldGguY29jb25pbm8uZWR1hi5odHRwczovL3NoaWJib2xldGguY29j b25pbm8uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRf5ApSnXQFJpysLJcHKJAtjvCgLzAN @@ -169042,7 +169042,7 @@ </md:ContactPerson> </md:EntityDescriptor> <md:EntityDescriptor - entityID="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/... xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"> + entityID="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNA... xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"> <md:KeyDescriptor> @@ -169072,30 +169072,30 @@ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" - Location="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/... index="1"/> + Location="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNA... index="1"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" - Location="http://clc2.uniservity.com/SingleSignOn?groupid=20090589/S... index="2"/> + Location="http://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAP... index="2"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" - Location="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/... index="3"/> + Location="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNA... index="3"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" - Location="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/... index="4"/> + Location="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNA... index="4"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" - Location="http://clc2.uniservity.com/SingleSignOn?groupid=20090589/S... index="5"/> + Location="http://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAP... index="5"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" - Location="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/... index="6"/> + Location="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNA... index="6"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.1:profiles:browser-post" - Location="http://clc2.uniservity.com/SingleSignOn?groupid=20090589/S... index="7"/> + Location="http://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAP... index="7"/> </md:SPSSODescriptor> <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"> - <md:OrganizationName xml:lang="en">clc2.uniservity.com/SingleSignOn?groupid=20090... + <md:OrganizationName xml:lang="en">clc2.uniservity.com/SingleSignOn?groupid=2.0.1... <md:OrganizationDisplayName xml:lang="en">TestShib SP</md:OrganizationDisplayName> - <md:OrganizationURL xml:lang="en">http://clc2.uniservity.com/SingleSignOn?groupi... + <md:OrganizationURL xml:lang="en">http://clc2.uniservity.com/SingleSignOn?groupi... </md:Organization> <md:ContactPerson contactType="technical" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"> <md:GivenName>Alex</md:GivenName> @@ -203419,10 +203419,10 @@ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute - Name="urn:oid:0.9.2342.19200300.100.1.1" + Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute - Name="urn:oid:0.9.2342.19200300.100.1.3" + Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute Name="dk:gov:saml:attribute:AssuranceLevel" @@ -203931,10 +203931,10 @@ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute - Name="urn:oid:0.9.2342.19200300.100.1.1" + Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <md:RequestedAttribute - Name="urn:oid:0.9.2342.19200300.100.1.3" + Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> <!-- <md:RequestedAttribute Name="dk:gov:saml:attribute:AssuranceLevel" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/> Modified: product/trunk/picketlink-webapps/idp/pom.xml =================================================================== --- product/trunk/picketlink-webapps/idp/pom.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-webapps/idp/pom.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.product</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.0</version> + <version>2.0.1-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: product/trunk/picketlink-webapps/pdp/pom.xml =================================================================== --- product/trunk/picketlink-webapps/pdp/pom.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-webapps/pdp/pom.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.product</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.0</version> + <version>2.0.1-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: product/trunk/picketlink-webapps/picketlink-sts/pom.xml =================================================================== --- product/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.product</groupId> <artifactId>picketlink-federation-webapps</artifactId> - <version>2.0.0</version> + <version>2.0.1-SNAPSHOT</version> <relativePath>../</relativePath> </parent> Modified: product/trunk/picketlink-webapps/pom.xml =================================================================== --- product/trunk/picketlink-webapps/pom.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/picketlink-webapps/pom.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.product</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.0</version> + <version>2.0.1-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: product/trunk/pom.xml =================================================================== --- product/trunk/pom.xml 2011-08-11 22:38:40 UTC (rev 1188) +++ product/trunk/pom.xml 2011-08-11 22:40:00 UTC (rev 1189) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.product</groupId> <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.0</version> + <version>2.0.1-SNAPSHOT</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion>