jboss-identity-commits
September 2009
jboss-identity-commits@lists.jboss.org
- 1 participants
- 47 discussions
JBoss Identity SVN: r801 - in idm/trunk: idm-testsuite/src/test/resources and 2 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-09-21 10:11:12 -0400 (Mon, 21 Sep 2009)
New Revision: 801
Added:
idm/trunk/idm-testsuite/src/test/resources/opends/config/schema/05-inetUser.ldif
Modified:
idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityObjectTypeConfiguration.java
idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java
idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/SimpleLDAPIdentityObjectTypeConfiguration.java
idm/trunk/idm-testsuite/src/test/resources/ldap/initial-empty-openldapds.ldif
idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad-local.xml
idm/trunk/idm-testsuite/src/test/resources/test-identity-config-openldapds.xml
Log:
some LDAP test fixes
Modified: idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityObjectTypeConfiguration.java
===================================================================
--- idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityObjectTypeConfiguration.java 2009-09-18 22:05:48 UTC (rev 800)
+++ idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityObjectTypeConfiguration.java 2009-09-21 14:11:12 UTC (rev 801)
@@ -51,6 +51,8 @@
String getParentMembershipAttributeName();
+ String getParentMembershipAttributePlaceholder();
+
boolean isParentMembershipAttributeDN();
boolean isAllowEmptyMemberships();
@@ -63,6 +65,8 @@
boolean isChildMembershipAttributeDN();
+ boolean isChildMembershipAttributeVirtual();
+
boolean isAllowEmptyPassword();
String getEnclosePasswordWith();
Modified: idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java
===================================================================
--- idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2009-09-18 22:05:48 UTC (rev 800)
+++ idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2009-09-21 14:11:12 UTC (rev 801)
@@ -97,6 +97,8 @@
private final String id;
+ public static final String MEMBERSHIP_TYPE = "JBOSS_IDENTITY_MEMBERSHIP";
+
private FeaturesMetaData supportedFeatures;
LDAPIdentityStoreConfiguration configuration;
@@ -705,12 +707,13 @@
IdentityObjectSearchCriteria criteria) throws IdentityException
{
- //TODO: relationshipType is ignored - maybe check and allow only MEMBERSHIP?
+ if (relationshipType != null && !relationshipType.getName().equals(MEMBERSHIP_TYPE))
+ {
+ throw new IdentityException("This store implementation supports only '" + MEMBERSHIP_TYPE +"' relationship type");
+ }
+ LDAPIdentityObjectImpl ldapIO = getSafeLDAPIO(ctx, identity);
-
- LDAPIdentityObjectImpl ldapFromIO = getSafeLDAPIO(ctx, identity);
-
LDAPIdentityObjectTypeConfiguration typeConfig = getTypeConfiguration(ctx, identity.getIdentityType());
LdapContext ldapContext = getLDAPContext(ctx);
@@ -723,157 +726,121 @@
// If parent simply look for all its members
if (parent)
{
- if (typeConfig.getParentMembershipAttributeName() == null)
+ if (typeConfig.getParentMembershipAttributeName() != null)
{
- throw new IdentityException("Membership attribute name not configured. Given IdentityObjectType cannot have" +
- "members: " + identity.getIdentityType().getName());
- }
- Attributes attrs = ldapContext.getAttributes(ldapFromIO.getDn());
- Attribute member = attrs.get(typeConfig.getParentMembershipAttributeName());
- if (member != null)
- {
- NamingEnumeration memberValues = member.getAll();
- while (memberValues.hasMoreElements())
+ Attributes attrs = ldapContext.getAttributes(ldapIO.getDn());
+ Attribute member = attrs.get(typeConfig.getParentMembershipAttributeName());
+
+ if (member != null)
{
- String memberRef = memberValues.nextElement().toString();
-
- if (typeConfig.isParentMembershipAttributeDN())
+ NamingEnumeration memberValues = member.getAll();
+ while (memberValues.hasMoreElements())
{
- //TODO: use direct LDAP query instaed of other find method and add attributesFilter
+ String memberRef = memberValues.nextElement().toString();
- if (criteria != null && criteria.getFilter() != null)
+ // Ignore placeholder value in memberships
+ String placeholder = typeConfig.getParentMembershipAttributePlaceholder();
+ if (placeholder != null && memberRef.equalsIgnoreCase(placeholder))
{
- String name = Tools.stripDnToName(memberRef);
- String regex = Tools.wildcardToRegex(criteria.getFilter());
+ continue;
+ }
- if (Pattern.matches(regex, name))
+ if (typeConfig.isParentMembershipAttributeDN())
+ {
+ //TODO: use direct LDAP query instead of other find method and add attributesFilter
+
+ if (criteria != null && criteria.getFilter() != null)
{
+ String name = Tools.stripDnToName(memberRef);
+ String regex = Tools.wildcardToRegex(criteria.getFilter());
+
+ if (Pattern.matches(regex, name))
+ {
+ objects.add(findIdentityObject(ctx, memberRef));
+ }
+ }
+ else
+ {
objects.add(findIdentityObject(ctx, memberRef));
}
}
else
{
- objects.add(findIdentityObject(ctx, memberRef));
+ //TODO: if relationships are not refered with DNs and only names its not possible to map
+ //TODO: them to proper IdentityType and keep name uniqnes per type. Workaround needed
+ throw new NotYetImplementedException("LDAP limitation. If relationship targets are not refered with FQDNs " +
+ "and only names, it's not possible to map them to proper IdentityType and keep name uniqnes per type. " +
+ "Workaround needed");
}
+ //break;
}
- else
- {
- //TODO: if relationships are not refered with DNs and only names its not possible to map
- //TODO: them to proper IdentityType and keep name uniqnes per type. Workaround needed
- throw new NotYetImplementedException("LDAP limitation. If relationship targets are not refered with FQDNs " +
- "and only names, it's not possible to map them to proper IdentityType and keep name uniqnes per type. " +
- "Workaround needed");
- }
- //break;
}
}
+ else
+ {
+
+ objects.addAll(findRelatedIdentityObjects(ctx, identity, ldapIO, criteria, false));
+
+ }
+
+
}
-
// if not parent then all parent entries need to be found
else
{
- // Search in all other type contexts
- for (IdentityObjectType parentType : configuration.getConfiguredTypes())
+ if (typeConfig.getChildMembershipAttributeName() == null)
{
- checkIOType(parentType);
+ objects.addAll(findRelatedIdentityObjects(ctx, identity, ldapIO, criteria, true));
+ }
+ else
+ {
+ Attributes attrs = ldapContext.getAttributes(ldapIO.getDn());
+ Attribute member = attrs.get(typeConfig.getChildMembershipAttributeName());
- LDAPIdentityObjectTypeConfiguration parentTypeConfiguration = getTypeConfiguration(ctx, parentType);
-
- List<String> allowedTypes = Arrays.asList(parentTypeConfiguration.getAllowedMembershipTypes());
-
- // Check if given identity type can be parent
- if (!allowedTypes.contains(identity.getIdentityType().getName()))
+ if (member != null)
{
- continue;
- }
+ NamingEnumeration memberValues = member.getAll();
+ while (memberValues.hasMoreElements())
+ {
+ String memberRef = memberValues.nextElement().toString();
- String nameFilter = "*";
+ if (typeConfig.isChildMembershipAttributeDN())
+ {
+ //TODO: use direct LDAP query instead of other find method and add attributesFilter
- //Filter by name
- if (criteria != null && criteria.getFilter() != null)
- {
- nameFilter = criteria.getFilter();
- }
+ if (criteria != null && criteria.getFilter() != null)
+ {
+ String name = Tools.stripDnToName(memberRef);
+ String regex = Tools.wildcardToRegex(criteria.getFilter());
- Control[] requestControls = null;
-
- StringBuilder af = new StringBuilder();
-
- // Filter by attribute values
- if (criteria != null && criteria.isFiltered())
- {
- af.append("(&");
-
- for (Map.Entry<String, String[]> stringEntry : criteria.getValues().entrySet())
- {
- for (String value : stringEntry.getValue())
+ if (Pattern.matches(regex, name))
+ {
+ objects.add(findIdentityObject(ctx, memberRef));
+ }
+ }
+ else
+ {
+ objects.add(findIdentityObject(ctx, memberRef));
+ }
+ }
+ else
{
- af.append("(")
- .append(stringEntry.getKey())
- .append("=")
- .append(value)
- .append(")");
+ //TODO: if relationships are not refered with DNs and only names its not possible to map
+ //TODO: them to proper IdentityType and keep name uniqnes per type. Workaround needed
+ throw new NotYetImplementedException("LDAP limitation. If relationship targets are not refered with FQDNs " +
+ "and only names, it's not possible to map them to proper IdentityType and keep name uniqnes per type. " +
+ "Workaround needed");
}
+ //break;
}
-
- af.append(")");
}
+ }
- // Add filter to search only parents of the given entry
- af.append("(")
- .append(parentTypeConfiguration.getParentMembershipAttributeName())
- .append("=");
- if (parentTypeConfiguration.isParentMembershipAttributeDN())
- {
- af.append(ldapFromIO.getDn());
- }
- else
- {
- //TODO: this doesn't make much sense unless parent/child are same identity types and resides in the same LDAP context
- af.append(ldapFromIO.getName());
- }
- af.append(")");
- String filter = parentTypeConfiguration.getEntrySearchFilter();
- List<SearchResult> sr = null;
- String[] entryCtxs = parentTypeConfiguration.getCtxDNs();
-
- if (filter != null && filter.length() > 0)
- {
-
- Object[] filterArgs = {nameFilter};
- sr = searchIdentityObjects(ctx,
- entryCtxs,
- "(&(" + filter + ")" + af.toString() + ")",
- filterArgs,
- new String[]{parentTypeConfiguration.getIdAttributeName()},
- requestControls);
- }
- else
- {
- filter = "(".concat(parentTypeConfiguration.getIdAttributeName()).concat("=").concat(nameFilter).concat(")");
- sr = searchIdentityObjects(ctx,
- entryCtxs,
- "(&(" + filter + ")" + af.toString() + ")",
- null,
- new String[]{parentTypeConfiguration.getIdAttributeName()},
- requestControls);
- }
-
- for (SearchResult res : sr)
- {
- LdapContext ldapCtx = (LdapContext)res.getObject();
- String dn = ldapCtx.getNameInNamespace();
-
- objects.add(createIdentityObjectInstance(ctx, parentType, res.getAttributes(), dn));
- }
- }
-
-
}
}
@@ -906,6 +873,177 @@
return objects;
}
+ public List<IdentityObject> findRelatedIdentityObjects(IdentityStoreInvocationContext ctx,
+ IdentityObject identity,
+ LDAPIdentityObjectImpl ldapIO,
+ IdentityObjectSearchCriteria criteria,
+ boolean parents)
+ throws IdentityException, NamingException
+ {
+
+ List<IdentityObject> objects = new LinkedList<IdentityObject>();
+
+ LDAPIdentityObjectTypeConfiguration typeConfiguration = getTypeConfiguration(ctx, identity.getIdentityType());
+
+ List<String> allowedTypes = Arrays.asList(typeConfiguration.getAllowedMembershipTypes());
+
+
+ // Search in all other type contexts
+ for (IdentityObjectType checkedIOType : configuration.getConfiguredTypes())
+ {
+ checkIOType(checkedIOType);
+
+ LDAPIdentityObjectTypeConfiguration checkedTypeConfiguration = getTypeConfiguration(ctx, checkedIOType);
+
+ List<String> checkedAllowedTypes = Arrays.asList(checkedTypeConfiguration.getAllowedMembershipTypes());
+
+ if (parents)
+ {
+ // Check if given identity type can be parent
+ if (!checkedAllowedTypes.contains(identity.getIdentityType().getName()))
+ {
+ continue;
+ }
+
+ }
+ else
+ {
+ //Check if given identity type can be child
+ if (!allowedTypes.contains(checkedIOType.getName()))
+ {
+ continue;
+ }
+ }
+
+ // Check if this type is capable to keep needed reference
+ if (parents && checkedTypeConfiguration.getParentMembershipAttributeName() == null)
+ {
+ continue;
+ }
+
+ if (!parents && checkedTypeConfiguration.getChildMembershipAttributeName() == null)
+ {
+ continue;
+ }
+
+ String nameFilter = "*";
+
+ //Filter by name
+ if (criteria != null && criteria.getFilter() != null)
+ {
+ nameFilter = criteria.getFilter();
+ }
+
+ Control[] requestControls = null;
+
+ StringBuilder af = new StringBuilder();
+
+ // Filter by attribute values
+ if (criteria != null && criteria.isFiltered())
+ {
+ af.append("(&");
+
+ for (Map.Entry<String, String[]> stringEntry : criteria.getValues().entrySet())
+ {
+ for (String value : stringEntry.getValue())
+ {
+ af.append("(")
+ .append(stringEntry.getKey())
+ .append("=")
+ .append(value)
+ .append(")");
+ }
+ }
+
+ af.append(")");
+ }
+
+
+ if(parents)
+ {
+ // Add filter to search only parents of the given entry
+ af.append("(")
+ .append(checkedTypeConfiguration.getParentMembershipAttributeName())
+ .append("=");
+ if (checkedTypeConfiguration.isParentMembershipAttributeDN())
+ {
+ af.append(ldapIO.getDn());
+ }
+ else
+ {
+ //TODO: this doesn't make much sense unless parent/child are same identity types and resides in the same LDAP context
+ af.append(ldapIO.getName());
+ }
+ af.append(")");
+ }
+ else
+ {
+ // Add filter to search only childs of the given entry
+ af.append("(")
+ .append(checkedTypeConfiguration.getChildMembershipAttributeName())
+ .append("=");
+ if (checkedTypeConfiguration.isChildMembershipAttributeDN())
+ {
+ af.append(ldapIO.getDn());
+ }
+ else
+ {
+ //TODO: this doesn't make much sense unless parent/child are same identity types and resides in the same LDAP context
+ af.append(ldapIO.getName());
+ }
+ af.append(")");
+ }
+
+
+ String filter = checkedTypeConfiguration.getEntrySearchFilter();
+ List<SearchResult> sr = null;
+
+ String[] entryCtxs = checkedTypeConfiguration.getCtxDNs();
+
+ if (filter != null && filter.length() > 0)
+ {
+
+ Object[] filterArgs = {nameFilter};
+ sr = searchIdentityObjects(ctx,
+ entryCtxs,
+ "(&(" + filter + ")" + af.toString() + ")",
+ filterArgs,
+ new String[]{checkedTypeConfiguration.getIdAttributeName()},
+ requestControls);
+ }
+ else
+ {
+ filter = "(".concat(checkedTypeConfiguration.getIdAttributeName()).concat("=").concat(nameFilter).concat(")");
+ sr = searchIdentityObjects(ctx,
+ entryCtxs,
+ "(&(" + filter + ")" + af.toString() + ")",
+ null,
+ new String[]{checkedTypeConfiguration.getIdAttributeName()},
+ requestControls);
+ }
+
+ for (SearchResult res : sr)
+ {
+ LdapContext ldapCtx = (LdapContext)res.getObject();
+ String dn = ldapCtx.getNameInNamespace();
+
+ if (parents)
+ {
+ // Ignore placeholder value in memberships
+ String placeholder = checkedTypeConfiguration.getParentMembershipAttributePlaceholder();
+ if (placeholder != null && dn.equalsIgnoreCase(placeholder))
+ {
+ continue;
+ }
+ }
+
+ objects.add(createIdentityObjectInstance(ctx, checkedIOType, res.getAttributes(), dn));
+ }
+ }
+
+ return objects;
+ }
+
public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext ctx,
IdentityObject identity,
IdentityObjectRelationshipType type,
@@ -913,10 +1051,12 @@
boolean named,
String name) throws IdentityException
{
- //TODO: relationshipType is ignored - maybe check and allow only MEMBERSHIP?
+ if (type == null || !type.getName().equals(MEMBERSHIP_TYPE))
+ {
+ throw new IdentityException("This store implementation supports only '" + MEMBERSHIP_TYPE +"' relationship type");
+ }
-
LDAPIdentityObjectImpl ldapIO = getSafeLDAPIO(ctx, identity);
LDAPIdentityObjectTypeConfiguration typeConfig = getTypeConfiguration(ctx, identity.getIdentityType());
@@ -932,115 +1072,95 @@
if (parent)
{
Attributes attrs = ldapContext.getAttributes(ldapIO.getDn());
- Attribute member = attrs.get(typeConfig.getParentMembershipAttributeName());
- if (member != null)
+ if (typeConfig.getParentMembershipAttributeName() != null )
{
- NamingEnumeration memberValues = member.getAll();
- while (memberValues.hasMoreElements())
+ Attribute member = attrs.get(typeConfig.getParentMembershipAttributeName());
+
+
+ if (member != null)
{
- String memberRef = memberValues.nextElement().toString();
-
- if (typeConfig.isParentMembershipAttributeDN())
+ NamingEnumeration memberValues = member.getAll();
+ while (memberValues.hasMoreElements())
{
- //TODO: use direct LDAP query instaed of other find method and add attributesFilter
+ String memberRef = memberValues.nextElement().toString();
+ // Ignore placeholder value in memberships
+ String placeholder = typeConfig.getParentMembershipAttributePlaceholder();
+ if (placeholder != null && memberRef.equalsIgnoreCase(placeholder))
+ {
+ continue;
+ }
- relationships.add(new LDAPIdentityObjectRelationshipImpl(null, ldapIO, findIdentityObject(ctx, memberRef)));
+ if (typeConfig.isParentMembershipAttributeDN())
+ {
+ //TODO: use direct LDAP query instaed of other find method and add attributesFilter
+ relationships.add(new LDAPIdentityObjectRelationshipImpl(MEMBERSHIP_TYPE, ldapIO, findIdentityObject(ctx, memberRef)));
+
+ }
+ else
+ {
+ //TODO: if relationships are not refered with DNs and only names its not possible to map
+ //TODO: them to proper IdentityType and keep name uniqnes per type. Workaround needed
+ throw new NotYetImplementedException("LDAP limitation. If relationship targets are not refered with FQDNs " +
+ "and only names, it's not possible to map them to proper IdentityType and keep name uniqnes per type. " +
+ "Workaround needed");
+ }
+ //break;
}
- else
- {
- //TODO: if relationships are not refered with DNs and only names its not possible to map
- //TODO: them to proper IdentityType and keep name uniqnes per type. Workaround needed
- throw new NotYetImplementedException("LDAP limitation. If relationship targets are not refered with FQDNs " +
- "and only names, it's not possible to map them to proper IdentityType and keep name uniqnes per type. " +
- "Workaround needed");
- }
- //break;
}
}
+ else
+ {
+
+ relationships.addAll(findRelationships(ctx, identity, ldapIO, false));
+ }
+
}
// if not parent then all parent entries need to be found
else
{
- // Search in all other type contexts
- for (IdentityObjectType parentType : configuration.getConfiguredTypes())
+ Attributes attrs = ldapContext.getAttributes(ldapIO.getDn());
+
+ if (typeConfig.getChildMembershipAttributeName() != null)
{
- checkIOType(parentType);
+ Attribute member = attrs.get(typeConfig.getChildMembershipAttributeName());
- LDAPIdentityObjectTypeConfiguration parentTypeConfiguration = getTypeConfiguration(ctx, parentType);
-
- List<String> allowedTypes = Arrays.asList(parentTypeConfiguration.getAllowedMembershipTypes());
-
- // Check if given identity type can be parent
- if (!allowedTypes.contains(identity.getIdentityType().getName()))
+ if (member != null)
{
- continue;
- }
+ NamingEnumeration memberValues = member.getAll();
+ while (memberValues.hasMoreElements())
+ {
+ String memberRef = memberValues.nextElement().toString();
- String nameFilter = "*";
+ // Ignore placeholder value in memberships
- //Filter by name
- Control[] requestControls = null;
+ if (typeConfig.isChildMembershipAttributeDN())
+ {
+ //TODO: use direct LDAP query instaed of other find method and add attributesFilter
- StringBuilder af = new StringBuilder();
+ relationships.add(new LDAPIdentityObjectRelationshipImpl(MEMBERSHIP_TYPE, findIdentityObject(ctx, memberRef), ldapIO));
-
- // Add filter to search only parents of the given entry
- af.append("(")
- .append(parentTypeConfiguration.getParentMembershipAttributeName())
- .append("=");
- if (parentTypeConfiguration.isParentMembershipAttributeDN())
- {
- af.append(ldapIO.getDn());
+ }
+ else
+ {
+ //TODO: if relationships are not refered with DNs and only names its not possible to map
+ //TODO: them to proper IdentityType and keep name uniqnes per type. Workaround needed
+ throw new NotYetImplementedException("LDAP limitation. If relationship targets are not refered with FQDNs " +
+ "and only names, it's not possible to map them to proper IdentityType and keep name uniqnes per type. " +
+ "Workaround needed");
+ }
+ //break;
+ }
}
- else
- {
- //TODO: this doesn't make much sense unless parent/child are same identity types and resides in the same LDAP context
- af.append(ldapIO.getName());
- }
- af.append(")");
-
- String filter = parentTypeConfiguration.getEntrySearchFilter();
- List<SearchResult> sr = null;
-
- String[] entryCtxs = parentTypeConfiguration.getCtxDNs();
-
- if (filter != null && filter.length() > 0)
- {
-
- Object[] filterArgs = {nameFilter};
- sr = searchIdentityObjects(ctx,
- entryCtxs,
- "(&(" + filter + ")" + af.toString() + ")",
- filterArgs,
- new String[]{parentTypeConfiguration.getIdAttributeName()},
- requestControls);
- }
- else
- {
- filter = "(".concat(parentTypeConfiguration.getIdAttributeName()).concat("=").concat(nameFilter).concat(")");
- sr = searchIdentityObjects(ctx,
- entryCtxs,
- "(&(" + filter + ")" + af.toString() + ")",
- null,
- new String[]{parentTypeConfiguration.getIdAttributeName()},
- requestControls);
- }
-
- for (SearchResult res : sr)
- {
- LdapContext ldapCtx = (LdapContext)res.getObject();
- String dn = ldapCtx.getNameInNamespace();
-
- relationships.add(new LDAPIdentityObjectRelationshipImpl(null, createIdentityObjectInstance(ctx, parentType, res.getAttributes(), dn), ldapIO));
- }
}
-
-
+ else
+ {
+ relationships.addAll(findRelationships(ctx, identity, ldapIO, true));
+ }
}
}
@@ -1064,6 +1184,157 @@
return relationships;
}
+ /**
+ * Search all configured LDAP contexts for possible Identity Object Types and lookup for parent/child references
+ * to form relationships
+ *
+ * @param ctx
+ * @param identity
+ * @param ldapIO
+ * @param parents if true will lookup parents to reference child, if false will look children to reference parent
+ * @return
+ * @throws IdentityException
+ * @throws NamingException
+ */
+ private Collection<LDAPIdentityObjectRelationshipImpl> findRelationships(IdentityStoreInvocationContext ctx,
+ IdentityObject identity,
+ LDAPIdentityObjectImpl ldapIO,
+ boolean parents)
+ throws IdentityException, NamingException
+ {
+
+ Set<LDAPIdentityObjectRelationshipImpl> relationships = new HashSet<LDAPIdentityObjectRelationshipImpl>();
+
+ LDAPIdentityObjectTypeConfiguration typeConfiguration = getTypeConfiguration(ctx, identity.getIdentityType());
+
+ List<String> allowedTypes = Arrays.asList(typeConfiguration.getAllowedMembershipTypes());
+//
+ // Search in all other type contexts
+ for (IdentityObjectType checkedIOType : configuration.getConfiguredTypes())
+ {
+ checkIOType(checkedIOType);
+
+ LDAPIdentityObjectTypeConfiguration checkedTypeConfiguration = getTypeConfiguration(ctx, checkedIOType);
+
+ List<String> checkedAllowedTypes = Arrays.asList(checkedTypeConfiguration.getAllowedMembershipTypes());
+
+ if (parents)
+ {
+ // Check if given identity type can be parent
+ if (!checkedAllowedTypes.contains(identity.getIdentityType().getName()))
+ {
+ continue;
+ }
+
+ }
+ else
+ {
+ //Check if given identity type can be child
+ if (!allowedTypes.contains(checkedIOType.getName()))
+ {
+ continue;
+ }
+ }
+
+ String nameFilter = "*";
+
+ //Filter by name
+ Control[] requestControls = null;
+
+ StringBuilder af = new StringBuilder();
+
+
+ if(parents)
+ {
+ // Add filter to search only parents of the given entry
+ af.append("(")
+ .append(checkedTypeConfiguration.getParentMembershipAttributeName())
+ .append("=");
+ if (checkedTypeConfiguration.isParentMembershipAttributeDN())
+ {
+ af.append(ldapIO.getDn());
+ }
+ else
+ {
+ //TODO: this doesn't make much sense unless parent/child are same identity types and resides in the same LDAP context
+ af.append(ldapIO.getName());
+ }
+ af.append(")");
+ }
+ else
+ {
+ // Add filter to search only childs of the given entry
+ af.append("(")
+ .append(checkedTypeConfiguration.getChildMembershipAttributeName())
+ .append("=");
+ if (checkedTypeConfiguration.isChildMembershipAttributeDN())
+ {
+ af.append(ldapIO.getDn());
+ }
+ else
+ {
+ //TODO: this doesn't make much sense unless parent/child are same identity types and resides in the same LDAP context
+ af.append(ldapIO.getName());
+ }
+ af.append(")");
+ }
+
+ String filter = checkedTypeConfiguration.getEntrySearchFilter();
+ List<SearchResult> sr = null;
+
+ String[] entryCtxs = checkedTypeConfiguration.getCtxDNs();
+
+ if (filter != null && filter.length() > 0)
+ {
+
+ Object[] filterArgs = {nameFilter};
+ sr = searchIdentityObjects(ctx,
+ entryCtxs,
+ "(&(" + filter + ")" + af.toString() + ")",
+ filterArgs,
+ new String[]{checkedTypeConfiguration.getIdAttributeName()},
+ requestControls);
+ }
+ else
+ {
+ filter = "(".concat(checkedTypeConfiguration.getIdAttributeName()).concat("=").concat(nameFilter).concat(")");
+ sr = searchIdentityObjects(ctx,
+ entryCtxs,
+ "(&(" + filter + ")" + af.toString() + ")",
+ null,
+ new String[]{checkedTypeConfiguration.getIdAttributeName()},
+ requestControls);
+ }
+
+ for (SearchResult res : sr)
+ {
+ LdapContext ldapCtx = (LdapContext)res.getObject();
+ String dn = ldapCtx.getNameInNamespace();
+
+
+
+ if (parents)
+ {
+ // Ignore placeholder values
+ String placeholder = checkedTypeConfiguration.getParentMembershipAttributePlaceholder();
+ if (placeholder != null && dn.equalsIgnoreCase(placeholder))
+ {
+ continue;
+ }
+
+
+ relationships.add(new LDAPIdentityObjectRelationshipImpl(MEMBERSHIP_TYPE, createIdentityObjectInstance(ctx, checkedIOType, res.getAttributes(), dn), ldapIO));
+ }
+ else
+ {
+ relationships.add(new LDAPIdentityObjectRelationshipImpl(MEMBERSHIP_TYPE, ldapIO, createIdentityObjectInstance(ctx, checkedIOType, res.getAttributes(), dn)));
+ }
+ }
+ }
+
+ return relationships;
+ }
+
public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext ctx,
IdentityObject identity,
IdentityObjectRelationshipType relationshipType,
@@ -1088,6 +1359,11 @@
);
}
+ if (relationshipType == null || !relationshipType.getName().equals(MEMBERSHIP_TYPE))
+ {
+ throw new IdentityException("This store implementation supports only '" + MEMBERSHIP_TYPE +"' relationship type");
+ }
+
LDAPIdentityObjectRelationshipImpl relationship = null;
LDAPIdentityObjectImpl ldapFromIO = getSafeLDAPIO(ctx, fromIdentity);
@@ -1095,6 +1371,7 @@
LDAPIdentityObjectImpl ldapToIO = getSafeLDAPIO(ctx, toIdentity);
LDAPIdentityObjectTypeConfiguration fromTypeConfig = getTypeConfiguration(ctx, fromIdentity.getIdentityType());
+ LDAPIdentityObjectTypeConfiguration toTypeConfig = getTypeConfiguration(ctx, toIdentity.getIdentityType());
LdapContext ldapContext = getLDAPContext(ctx);
@@ -1110,21 +1387,44 @@
// Construct new member attribute values
Attributes attrs = new BasicAttributes(true);
- Attribute member = new BasicAttribute(fromTypeConfig.getParentMembershipAttributeName());
+ if (fromTypeConfig.getParentMembershipAttributeName() != null)
+ {
- if (fromTypeConfig.isParentMembershipAttributeDN())
- {
- member.add(ldapToIO.getDn());
+ Attribute member = new BasicAttribute(fromTypeConfig.getParentMembershipAttributeName());
+
+ if (fromTypeConfig.isParentMembershipAttributeDN())
+ {
+ member.add(ldapToIO.getDn());
+ }
+ else
+ {
+ member.add(toIdentity.getName());
+ }
+
+ attrs.put(member);
+
+ ldapContext.modifyAttributes(ldapFromIO.getDn(), DirContext.ADD_ATTRIBUTE, attrs);
}
- else
+
+ if (toTypeConfig.getChildMembershipAttributeName() != null && !toTypeConfig.isChildMembershipAttributeVirtual())
{
- member.add(toIdentity.getName());
- }
- attrs.put(member);
+ Attribute member = new BasicAttribute(toTypeConfig.getChildMembershipAttributeName());
- ldapContext.modifyAttributes(ldapFromIO.getDn(), DirContext.ADD_ATTRIBUTE, attrs);
+ if (toTypeConfig.isChildMembershipAttributeDN())
+ {
+ member.add(ldapFromIO.getDn());
+ }
+ else
+ {
+ member.add(fromIdentity.getName());
+ }
+ attrs.put(member);
+
+ ldapContext.modifyAttributes(ldapToIO.getDn(), DirContext.ADD_ATTRIBUTE, attrs);
+ }
+
relationship = new LDAPIdentityObjectRelationshipImpl(name, ldapFromIO, ldapToIO);
}
@@ -1165,6 +1465,7 @@
LDAPIdentityObjectImpl ldapToIO = getSafeLDAPIO(ctx, toIdentity);
LDAPIdentityObjectTypeConfiguration fromTypeConfig = getTypeConfiguration(ctx, fromIdentity.getIdentityType());
+ LDAPIdentityObjectTypeConfiguration toTypeConfig = getTypeConfiguration(ctx, toIdentity.getIdentityType());
// If relationship is not allowed simply return
//TODO: use features description instead
@@ -1189,21 +1490,43 @@
//construct new member attribute values
Attributes attrs = new BasicAttributes(true);
- Attribute member = new BasicAttribute(fromTypeConfig.getParentMembershipAttributeName());
+ if (fromTypeConfig.getParentMembershipAttributeName() != null)
+ {
- if (fromTypeConfig.isParentMembershipAttributeDN())
- {
- member.add(ldapToIO.getDn());
+ Attribute member = new BasicAttribute(fromTypeConfig.getParentMembershipAttributeName());
+
+ if (fromTypeConfig.isParentMembershipAttributeDN())
+ {
+ member.add(ldapToIO.getDn());
+ }
+ else
+ {
+ member.add(toIdentity.getName());
+ }
+
+ attrs.put(member);
+
+ ldapContext.modifyAttributes(ldapFromIO.getDn(), DirContext.REMOVE_ATTRIBUTE, attrs);
}
- else
+
+ if (toTypeConfig.getChildMembershipAttributeName() != null && !toTypeConfig.isChildMembershipAttributeVirtual())
{
- member.add(toIdentity.getName());
- }
+ Attribute member = new BasicAttribute(toTypeConfig.getChildMembershipAttributeName());
- attrs.put(member);
+ if (toTypeConfig.isChildMembershipAttributeDN())
+ {
+ member.add(ldapFromIO.getDn());
+ }
+ else
+ {
+ member.add(fromIdentity.getName());
+ }
- ldapContext.modifyAttributes(ldapFromIO.getDn(), DirContext.REMOVE_ATTRIBUTE, attrs);
+ attrs.put(member);
+ ldapContext.modifyAttributes(ldapToIO.getDn(), DirContext.REMOVE_ATTRIBUTE, attrs);
+ }
+
}
catch (NamingException e)
{
@@ -1232,13 +1555,17 @@
);
}
+
// as relationship type is ignored in this impl for now...
removeRelationship(ctx, identity1, identity2, null, null);
removeRelationship(ctx, identity2, identity1, null, null);
}
- public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext ctx, IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType) throws IdentityException
+ public Set<IdentityObjectRelationship> resolveRelationships(IdentityStoreInvocationContext ctx,
+ IdentityObject fromIdentity,
+ IdentityObject toIdentity,
+ IdentityObjectRelationshipType relationshipType) throws IdentityException
{
// relationshipType is ignored for now
@@ -1251,12 +1578,20 @@
);
}
+ if (relationshipType != null && !relationshipType.getName().equals(MEMBERSHIP_TYPE))
+ {
+ throw new IdentityException("This store implementation supports only '" + MEMBERSHIP_TYPE +"' relationship type");
+ }
+
Set<IdentityObjectRelationship> relationships = new HashSet<IdentityObjectRelationship>();
+
+
LDAPIdentityObjectImpl ldapFromIO = getSafeLDAPIO(ctx, fromIdentity);
LDAPIdentityObjectImpl ldapToIO = getSafeLDAPIO(ctx, toIdentity);
LDAPIdentityObjectTypeConfiguration fromTypeConfig = getTypeConfiguration(ctx, fromIdentity.getIdentityType());
+ LDAPIdentityObjectTypeConfiguration toTypeConfig = getTypeConfiguration(ctx, toIdentity.getIdentityType());
// If relationship is not allowed return empty set
//TODO: use features description instead
@@ -1271,24 +1606,49 @@
try
{
Attributes attrs = ldapContext.getAttributes(ldapFromIO.getDn());
- Attribute member = attrs.get(fromTypeConfig.getParentMembershipAttributeName());
- if (member != null)
+ if (fromTypeConfig.getParentMembershipAttributeName() != null)
{
- NamingEnumeration memberValues = member.getAll();
- while (memberValues.hasMoreElements())
+ Attribute member = attrs.get(fromTypeConfig.getParentMembershipAttributeName());
+
+ if (member != null)
{
- String memberRef = memberValues.nextElement().toString();
+ NamingEnumeration memberValues = member.getAll();
+ while (memberValues.hasMoreElements())
+ {
+ String memberRef = memberValues.nextElement().toString();
- if ((fromTypeConfig.isParentMembershipAttributeDN() && memberRef.equals(ldapToIO.getDn())) ||
- (!fromTypeConfig.isParentMembershipAttributeDN() && memberRef.equals(ldapToIO.getName())))
+ if ((fromTypeConfig.isParentMembershipAttributeDN() && memberRef.equals(ldapToIO.getDn())) ||
+ (!fromTypeConfig.isParentMembershipAttributeDN() && memberRef.equals(ldapToIO.getName())))
+ {
+ //TODO: impl lacks support for rel type
+ relationships.add(new LDAPIdentityObjectRelationshipImpl(MEMBERSHIP_TYPE, ldapFromIO, ldapToIO));
+ }
+ }
+ }
+ }
+ else if (toTypeConfig.getChildMembershipAttributeName() != null)
+ {
+ Attribute member = attrs.get(toTypeConfig.getChildMembershipAttributeName());
+
+ if (member != null)
+ {
+ NamingEnumeration memberValues = member.getAll();
+ while (memberValues.hasMoreElements())
{
- //TODO: impl lacks support for rel type
- relationships.add(new LDAPIdentityObjectRelationshipImpl(null, ldapFromIO, ldapToIO));
+ String memberRef = memberValues.nextElement().toString();
+
+ if ((fromTypeConfig.isChildMembershipAttributeDN() && memberRef.equals(ldapFromIO.getDn())) ||
+ (!fromTypeConfig.isChildMembershipAttributeDN() && memberRef.equals(ldapFromIO.getName())))
+ {
+ //TODO: impl lacks support for rel type
+ relationships.add(new LDAPIdentityObjectRelationshipImpl(MEMBERSHIP_TYPE, ldapFromIO, ldapToIO));
+ }
}
}
}
+
}
catch (NamingException e)
{
Modified: idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/SimpleLDAPIdentityObjectTypeConfiguration.java
===================================================================
--- idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/SimpleLDAPIdentityObjectTypeConfiguration.java 2009-09-18 22:05:48 UTC (rev 800)
+++ idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/SimpleLDAPIdentityObjectTypeConfiguration.java 2009-09-21 14:11:12 UTC (rev 801)
@@ -57,6 +57,8 @@
private final String parentMembershipAttributeName;
+ private final String parentMembershipAttributePlaceholder;
+
private final boolean isParentMembershipAttributeDN;
private final boolean allowEmptyMemberships;
@@ -67,6 +69,8 @@
private final boolean isChildMembershipAttributeDN;
+ private final boolean isChildMembershipAttributeVirtual;
+
private final boolean allowEmptyPassword;
private final String enclosePasswordWith;
@@ -94,6 +98,8 @@
public static final String PARENT_MEMBERSHIP_ATTRIBUTE_NAME = "parentMembershipAttributeName";
+ public static final String PARENT_MEMBERSHIP_ATTRIBUTE_PLACEHOLDER = "parentMembershipAttributePlaceholder";
+
public static final String IS_PARENT_MEMBERSHIP_ATTRIBUTE_DN = "isParentMembershipAttributeDN";
public static final String ALLOW_EMPTY_MEMBERSHIPS = "isAllowEmptyMemberships";
@@ -104,6 +110,8 @@
public static final String CHILD_MEMBERSHIP_ATTRIBUTE_DN = "childMembershipAttributeDN";
+ public static final String CHILD_MEMBERSHIP_ATTRIBUTE_VIRTUAL = "childMembershipAttributeVirtual";
+
public static final String ALLOW_EMPTY_PASSWORD = "allowEmptyPassword";
public static final String ENCLOSE_PASSWORD_WITH = "enclosePasswordWith";
@@ -122,6 +130,7 @@
this.entrySearchFilter = objectTypeMD.getOptionSingleValue(ENTRY_SEARCH_FILTER);
this.entrySearchScope = objectTypeMD.getOptionSingleValue(ENTRY_SEARCH_SCOPE);
this.parentMembershipAttributeName = objectTypeMD.getOptionSingleValue(PARENT_MEMBERSHIP_ATTRIBUTE_NAME);
+ this.parentMembershipAttributePlaceholder = objectTypeMD.getOptionSingleValue(PARENT_MEMBERSHIP_ATTRIBUTE_PLACEHOLDER);
this.childMembershipAttributeName = objectTypeMD.getOptionSingleValue(CHILD_MEMBERSHIP_ATTRIBUTE_NAME);
this.enclosePasswordWith = objectTypeMD.getOptionSingleValue(ENCLOSE_PASSWORD_WITH);
this.passwordEncoding = objectTypeMD.getOptionSingleValue(PASSWORD_ENCODIGN);
@@ -167,6 +176,16 @@
this.isChildMembershipAttributeDN = false;
}
+ String isChildMembershipAttributeVirtual = objectTypeMD.getOptionSingleValue(CHILD_MEMBERSHIP_ATTRIBUTE_DN);
+ if (isChildMembershipAttributeVirtual != null && isChildMembershipAttributeVirtual.equalsIgnoreCase("false"))
+ {
+ this.isChildMembershipAttributeVirtual = false;
+ }
+ else
+ {
+ this.isChildMembershipAttributeVirtual = true;
+ }
+
String allowEmptyPassword = objectTypeMD.getOptionSingleValue(ALLOW_EMPTY_PASSWORD);
if (allowEmptyPassword != null && allowEmptyPassword.equalsIgnoreCase("true"))
{
@@ -349,6 +368,11 @@
return parentMembershipAttributeName;
}
+ public String getParentMembershipAttributePlaceholder()
+ {
+ return parentMembershipAttributePlaceholder;
+ }
+
public boolean isParentMembershipAttributeDN()
{
return isParentMembershipAttributeDN;
@@ -395,6 +419,11 @@
return isChildMembershipAttributeDN;
}
+ public boolean isChildMembershipAttributeVirtual()
+ {
+ return isChildMembershipAttributeVirtual;
+ }
+
public boolean isAllowEmptyPassword()
{
return allowEmptyPassword;
Modified: idm/trunk/idm-testsuite/src/test/resources/ldap/initial-empty-openldapds.ldif
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/ldap/initial-empty-openldapds.ldif 2009-09-18 22:05:48 UTC (rev 800)
+++ idm/trunk/idm-testsuite/src/test/resources/ldap/initial-empty-openldapds.ldif 2009-09-21 14:11:12 UTC (rev 801)
@@ -18,6 +18,11 @@
objectclass: organization
o: test
+dn: ou=placeholder,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com
+objectclass: top
+objectclass: organizationalUnit
+ou: placeholder
+
dn: ou=People,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com
objectclass: top
objectclass: organizationalUnit
Added: idm/trunk/idm-testsuite/src/test/resources/opends/config/schema/05-inetUser.ldif
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/opends/config/schema/05-inetUser.ldif (rev 0)
+++ idm/trunk/idm-testsuite/src/test/resources/opends/config/schema/05-inetUser.ldif 2009-09-21 14:11:12 UTC (rev 801)
@@ -0,0 +1,21 @@
+# Some schema parts that were missing in standard set
+#
+#
+#
+dn: cn=schema
+objectClass: top
+objectClass: ldapSubentry
+objectClass: subschema
+attributeTypes: ( 2.16.840.1.113730.3.1.692 NAME 'inetUserStatus'
+ DESC '"active", "inactive", or "deleted" status of a user' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ SINGLE-VALUE X-ORIGIN 'Nortel subscriber interoperability' )
+attributeTypes: ( 2.16.840.1.113730.3.1.693 NAME 'inetUserHttpURL'
+ DESC 'A users Web addresses' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ X-ORIGIN 'Nortel subscriber interoperability' )
+attributeTypes: ( 1.2.840.113556.1.2.102 NAME 'memberOf'
+ DESC 'Group that theentry belongs to' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+ X-ORIGIN 'iPlanet Delegated Administrator' )
+objectClasses: ( 2.16.840.1.113730.3.2.130 NAME 'inetUser'
+ DESC 'Auxiliary class which must be present in an entry for delivery of subscriber services'
+ SUP top AUXILIARY MAY ( uid $ inetUserStatus $ inetUserHttpURL $ userPassword $ memberOf )
+ X-ORIGIN 'Nortel subscriber interoperability' )
Modified: idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad-local.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad-local.xml 2009-09-18 22:05:48 UTC (rev 800)
+++ idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad-local.xml 2009-09-21 14:11:12 UTC (rev 801)
@@ -910,7 +910,7 @@
</option>
<option>
<name>adminPassword</name>
- <value>!Q2w3e4r</value>
+ <value>1q@W3e4r</value>
</option>
<option>
<name>authenticationMethod</name>
Modified: idm/trunk/idm-testsuite/src/test/resources/test-identity-config-openldapds.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/test-identity-config-openldapds.xml 2009-09-18 22:05:48 UTC (rev 800)
+++ idm/trunk/idm-testsuite/src/test/resources/test-identity-config-openldapds.xml 2009-09-21 14:11:12 UTC (rev 801)
@@ -621,6 +621,10 @@
<value>member</value>
</option>
<option>
+ <name>parentMembershipAttributePlaceholder</name>
+ <value>ou=placeholder,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com</value>
+ </option>
+ <option>
<name>isParentMembershipAttributeDN</name>
<value>true</value>
</option>
@@ -632,6 +636,7 @@
<name>createEntryAttributeValues</name>
<value>objectClass=top</value>
<value>objectClass=groupOfNames</value>
+ <value>member=ou=placeholder,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com</value>
</option>
</options>
</identity-object-type>
@@ -683,6 +688,10 @@
<value>true</value>
</option>
<option>
+ <name>parentMembershipAttributePlaceholder</name>
+ <value>ou=placeholder,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com</value>
+ </option>
+ <option>
<name>allowEmptyMemberships</name>
<value>true</value>
</option>
@@ -690,6 +699,7 @@
<name>createEntryAttributeValues</name>
<value>objectClass=top</value>
<value>objectClass=groupOfNames</value>
+ <value>member=ou=placeholder,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com</value>
</option>
</options>
</identity-object-type>
@@ -733,6 +743,10 @@
<value>member</value>
</option>
<option>
+ <name>parentMembershipAttributePlaceholder</name>
+ <value>ou=placeholder,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com</value>
+ </option>
+ <option>
<name>isParentMembershipAttributeDN</name>
<value>true</value>
</option>
@@ -744,6 +758,7 @@
<name>createEntryAttributeValues</name>
<value>objectClass=top</value>
<value>objectClass=groupOfNames</value>
+ <value>member=ou=placeholder,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com</value>
</option>
</options>
</identity-object-type>
@@ -779,6 +794,10 @@
<value>member</value>
</option>
<option>
+ <name>parentMembershipAttributePlaceholder</name>
+ <value>ou=placeholder,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com</value>
+ </option>
+ <option>
<name>isParentMembershipAttributeDN</name>
<value>true</value>
</option>
@@ -790,6 +809,7 @@
<name>createEntryAttributeValues</name>
<value>objectClass=top</value>
<value>objectClass=groupOfNames</value>
+ <value>member=ou=placeholder,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com</value>
</option>
</options>
</identity-object-type>
@@ -825,6 +845,10 @@
<value>member</value>
</option>
<option>
+ <name>parentMembershipAttributePlaceholder</name>
+ <value>ou=placeholder,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com</value>
+ </option>
+ <option>
<name>isParentMembershipAttributeDN</name>
<value>true</value>
</option>
@@ -836,6 +860,7 @@
<name>createEntryAttributeValues</name>
<value>objectClass=top</value>
<value>objectClass=groupOfNames</value>
+ <value>member=ou=placeholder,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com</value>
</option>
</options>
</identity-object-type>
@@ -871,6 +896,10 @@
<value>member</value>
</option>
<option>
+ <name>parentMembershipAttributePlaceholder</name>
+ <value>ou=placeholder,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com</value>
+ </option>
+ <option>
<name>isParentMembershipAttributeDN</name>
<value>true</value>
</option>
@@ -882,6 +911,7 @@
<name>createEntryAttributeValues</name>
<value>objectClass=top</value>
<value>objectClass=groupOfNames</value>
+ <value>member=ou=placeholder,o=test,o=trunk,o=idm,o=jbid,dc=my-domain,dc=com</value>
</option>
</options>
</identity-object-type>
14 years, 7 months
- 1
- 0
JBoss Identity SVN: r800 - in authz/trunk/documentation/reference-guide/en: modules and 1 other directory.
by jboss-identity-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-09-18 18:05:48 -0400 (Fri, 18 Sep 2009)
New Revision: 800
Added:
authz/trunk/documentation/reference-guide/en/modules/getting-started.xml
Modified:
authz/trunk/documentation/reference-guide/en/master.xml
authz/trunk/documentation/reference-guide/en/modules/framework.xml
Log:
more documentation
Modified: authz/trunk/documentation/reference-guide/en/master.xml
===================================================================
--- authz/trunk/documentation/reference-guide/en/master.xml 2009-09-17 18:17:49 UTC (rev 799)
+++ authz/trunk/documentation/reference-guide/en/master.xml 2009-09-18 22:05:48 UTC (rev 800)
@@ -17,9 +17,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/concepts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/architecture.xml"/>
- <!--
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/sample.xml"/>
- -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/getting-started.xml"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/framework.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/authz-component-spec.xml"/>
<!--
Modified: authz/trunk/documentation/reference-guide/en/modules/framework.xml
===================================================================
--- authz/trunk/documentation/reference-guide/en/modules/framework.xml 2009-09-17 18:17:49 UTC (rev 799)
+++ authz/trunk/documentation/reference-guide/en/modules/framework.xml 2009-09-18 22:05:48 UTC (rev 800)
@@ -178,6 +178,18 @@
is composed of. It is processed by the <emphasis>PolicyComposer</emphasis> service. The <emphasis>PolicyComposer</emphasis> generates the low-level policy instance.
The <emphasis>PolicyComposer</emphasis> shields the Application Developer from low-level policy processing and representation details.
</para>
+ <para>
+ Provisioning is an open ended aspect of authorization. It spans from <emphasis>static xml based provisioning</emphasis> on one end to a fully dynamic/centralized management tool based provisioning.
+ Here are some of the provisioning scenarios that are possible:
+ <itemizedlist>
+ <listitem>
+ </listitem>
+ <listitem>
+ </listitem>
+ <listitem>
+ </listitem>
+ </itemizedlist>
+ </para>
<sect3>
<title>Provisioning Phase Life Cycle</title>
<para>
Added: authz/trunk/documentation/reference-guide/en/modules/getting-started.xml
===================================================================
--- authz/trunk/documentation/reference-guide/en/modules/getting-started.xml (rev 0)
+++ authz/trunk/documentation/reference-guide/en/modules/getting-started.xml 2009-09-18 22:05:48 UTC (rev 800)
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="getting-started">
+ <chapterinfo>
+ <author>
+ <firstname>Sohil</firstname>
+ <surname>Shah</surname>
+ <email>sshah(a)redhat.com</email>
+ </author>
+ </chapterinfo>
+ <title>Getting Started</title>
+ <sect1>
+ <title>End-to-End Development Process</title>
+ <para>
+ The Development Process for the framework is split into three steps.
+ </para>
+ <sect2>
+ <title>Core Application/Infrastructure Development</title>
+ <para>
+ This is where the <emphasis role="bold">Application Developers</emphasis> develop their applications without any concern of embedding any security checking logic inside their implementation.
+ Basically, think of it as developing an application that does not have any knowledge of security functionality.
+ </para>
+ <para>
+ <programlisting>
+ <![CDATA[
+public class Pojo
+{
+ private String sensitiveData;
+
+ public Pojo()
+ {
+
+ }
+
+ public String getSensitiveData()
+ {
+ return this.sensitiveData;
+ }
+
+ public void setSensitiveData(String sensitiveData)
+ {
+ this.sensitiveData = sensitiveData;
+ }
+}
+ ]]>
+ </programlisting>
+ </para>
+ <para>
+ This shows a very simple POJO that carries some sensitive data within one of its fields named: <emphasis>sensitiveData</emphasis>.
+ This data is private and is accessible via standard get/set methods.
+ <emphasis role="bold">Note:</emphasis> This is simple application code and it has no knowledge about the existence of a security service
+ </para>
+ </sect2>
+ <sect2>
+ <title>Enforcement Layer</title>
+ <para>
+ This is the <emphasis>cross cutting</emphasis> layer of the application that introduces <emphasis>authorization functionality</emphasis> to an otherwise authorization agnostic application. This layer makes the "Enforcement Phase" possible.
+ </para>
+ <para>
+ Development of this layer is primarily the responsibility of a <emphasis role="bold">System Integrator</emphasis> or a <emphasis role="bold">Platform Developer</emphasis>.
+ The <emphasis role="bold">Application Developer</emphasis> typically integrates it via
+ configuration as a <emphasis>container service</emphasis>.
+ </para>
+ <para>
+ The <emphasis>Enforcement Layer</emphasis> is integrated as a <emphasis>JBoss AOP Interceptor</emphasis>, for the POJO application in this example.
+ </para>
+ <para>
+ <programlisting>
+ <![CDATA[
+<aop>
+ <bind pointcut="execution(* org.jboss.security.authz.samples.pojo.Pojo->*(..))">
+ <interceptor class="org.jboss.security.authz.samples.pojo.enforcement.SecurityInterceptor"/>
+ </bind>
+</aop>
+ ]]>
+ </programlisting>
+ </para>
+ <para>
+ This <emphasis>jboss-aop.xml</emphasis> specifies the scope of code weaving to integrate the <emphasis>SecurityInterceptor</emphasis>. In this case it says,
+ intercept all method calls on <emphasis>org.jboss.security.authz.samples.pojo.Pojo</emphasis>. The scope of interception can be increased/decreased based
+ on application requirements/design
+ </para>
+ <para>
+ <emphasis role="bold">Security Interceptor</emphasis> explanation:
+ <programlisting>
+ <![CDATA[
+MethodInvocation methodInvocation = (MethodInvocation)invocation;
+Object pojoBeingAccessed = methodInvocation.getTargetObject();
+Method methodBeingCalled = methodInvocation.getMethod();
+ ]]>
+ </programlisting>
+ </para>
+ <para>
+ Gets information about the POJO instance being accessed <emphasis role="bold">Resource</emphasis>, and the method being invoked <emphasis role="bold">Action</emphasis>
+ </para>
+ <para>
+ <programlisting>
+ <![CDATA[
+Identity identity = new Identity();
+identity.setName(session.getUsername());
+
+Roles roles = new Roles();
+if(session.getRoles() != null)
+{
+ for(String roleName: session.getRoles())
+ roles.addName(roleName);
+}
+
+//Resource Component
+URIResource resource = new URIResource();
+resource.setUri(new URI(pojoBeingAccessed.getClass().getName()));
+
+//Action Component
+Object action = null;
+if(methodBeingCalled.getName().startsWith("get"))
+{
+ action = new Read();
+}
+else if(methodBeingCalled.getName().startsWith("set"))
+{
+ action = new Write();
+}
+ ]]>
+ </programlisting>
+ Populating <emphasis role="bold">Authz Components</emphasis> with runtime application state. In this example, its populating the Identity <emphasis>(Subject)</emphasis>, Roles <emphasis>(Subject)</emphasis>,
+ URIResource <emphasis>(Resource)</emphasis>, and Read/Write <emphasis>(Action)</emphasis> components.
+ </para>
+ <para>
+ <programlisting>
+ <![CDATA[
+//Create an EnforcementContext and start the "Enforcement Phase" with the security framework
+EnforcementContext context = new EnforcementContext();
+context.setIgnoreCache(true);
+context.setAttribute("pojo", resource);
+context.setAttribute("method", action);
+context.setAttribute("identity", identity);
+context.setAttribute("roles", roles);
+
+//Process the result from Enforcement Phase execution
+EnforcementResponse response = this.getEnforcer().checkAccess(context);
+
+if(response.isAccessGranted())
+{
+ //Access to the Pojo is granted.....Proceed..
+ return invocation.invokeNext();
+}
+else
+{
+ //Throw appropriate exception or handle it according to what the requirements are.........
+ throw new IllegalAccessException("Pojo Access Denied!!!");
+}
+ ]]>
+ </programlisting>
+ Creates an <emphasis role="bold">EnforcementContext</emphasis> populated with the above <emphasis role="bold">Authz Components</emphasis>, uses the <emphasis role="bold">Enforcer</emphasis>
+ to perform a security check, and finally depending upon <emphasis>Permit</emphasis> or <emphasis>Deny</emphasis> result, either propagates the method call further or throws an <emphasis>IllegalAccessException</emphasis>
+ </para>
+ </sect2>
+ <sect2>
+ <title>Provisioning Layer</title>
+ <para>
+ This is the provisioning aspect of authorization. This layer provides <emphasis>policy management</emphasis>
+ capabilities within the context of functional requirements of the application in question. This layer makes the "Provisioning Phase" possible.
+ </para>
+ <para>
+ <programlisting>
+ <![CDATA[
+// SetUp Resource
+URIResource resource = new URIResource();
+resource.setUri(new URI(Pojo.class.getName()));
+
+Read read = new Read();
+Roles readRoles = new Roles();
+readRoles.setMustMatchAll(false);
+readRoles.addName("regular");
+readRoles.addName("/blah1/blah2/blah3");
+
+Write write = new Write();
+Roles writeRoles = new Roles();
+writeRoles.setMustMatchAll(false);
+writeRoles.addName("admin");
+ ]]>
+ </programlisting>
+ The above code sets up the state of the <emphasis role="bold">Authz Components</emphasis> used to generate a specific <emphasis>policy</emphasis>.
+ <itemizedlist>
+ <listitem>
+ Step 1: Specifies that the resource "org.jboss.security.authz.samples.pojo.POJO" needs to be protected
+ </listitem>
+ <listitem>
+ Step 2: Specfies that the "getSensitiveData" method should be accessible <emphasis>only</emphasis> by the specified roles
+ </listitem>
+ <listitem>
+ Step 3: Specifies that the "setSensitiveData" method should be accessible <emphasis>only</emphasis> by the specified roles
+ </listitem>
+ </itemizedlist>
+ </para>
+ <para>
+ <programlisting>
+ <![CDATA[
+// Setup the Context for the Composition with these components
+CompositionContext context = new CompositionContext();
+context.setPolicyTarget(resource);
+context.addPolicyRule(Effect.PERMIT, read, readRoles,"allowExpression");
+context.addPolicyRule(Effect.PERMIT, write, writeRoles,"allowExpression");
+
+// Store the policy into the Policy Server
+this.getProvisioner().deploy(context);
+ ]]>
+ </programlisting>
+ Generates a <emphasis>CompositionContext</emphasis> populated with the proper <emphasis role="bold">Authz Components</emphasis>.
+ The <emphasis>CompositionContext</emphasis> is then handed over to the policy deployer to provision the single policy rule, that meets the
+ above criteria specified by the components.
+ </para>
+ </sect2>
+ <sect2>
+ <title>Full Picture</title>
+ <sect3>
+ <title>Sample Code: Core Application/Infrastructure Development</title>
+ <para>
+ <programlisting>
+ <![CDATA[
+package org.jboss.security.authz.samples.pojo;
+
+/**
+ * This is the core application level component.
+ *
+ * Notice there is absolutely no security code here....It does not even know the security service exists
+ *
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class Pojo
+{
+ private String sensitiveData;
+
+ public Pojo()
+ {
+
+ }
+
+ public String getSensitiveData()
+ {
+ return this.sensitiveData;
+ }
+
+ public void setSensitiveData(String sensitiveData)
+ {
+ this.sensitiveData = sensitiveData;
+ }
+}
+ ]]>
+ </programlisting>
+ </para>
+ </sect3>
+ <sect3>
+ <title>Sample Code: Enforcement Layer</title>
+ <para>
+ jboss-app.xml
+ <programlisting>
+ <![CDATA[
+<aop>
+ <bind pointcut="execution(* org.jboss.security.authz.samples.pojo.Pojo->*(..))">
+ <interceptor class="org.jboss.security.authz.samples.pojo.enforcement.SecurityInterceptor"/>
+ </bind>
+</aop>
+ ]]>
+ </programlisting>
+ </para>
+ <para>
+ <programlisting>
+ <![CDATA[
+/**
+ * A sample Enforcement Interceptor used to inject the security service into the application
+ *
+ * The scope of interception can be increased/decreased depending upon the application's security requirements
+ *
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class SecurityInterceptor implements Interceptor
+{
+ private static Logger log = Logger.getLogger(SecurityInterceptor.class);
+
+ public String getName()
+ {
+ return this.getClass().getName();
+ }
+
+ private PolicyEnforcementPoint getEnforcer()
+ {
+ return (PolicyEnforcementPoint)ServiceContainer.lookup("/agent/LocalEnforcementPoint");
+ }
+ public Object invoke(Invocation invocation) throws Throwable
+ {
+ try
+ {
+ MethodInvocation methodInvocation = (MethodInvocation)invocation;
+
+ Object pojoBeingAccessed = methodInvocation.getTargetObject();
+ Method methodBeingCalled = methodInvocation.getMethod();
+
+ //Get the runtime application state (AuthenticatedSession) from ThreadLocal
+ AuthenticatedSession session = (AuthenticatedSession)AuthenticatedSession.activeSession.get();
+ if(session == null)
+ {
+ //Anonymous access
+ session = new AuthenticatedSession();
+ session.setUsername("anonymous");
+ session.addRole("anonymous");
+ }
+
+ //Properly propagate runtime application state to the state of appropriate "Authz Components"
+ //Subject Components
+ Identity identity = new Identity();
+ identity.setName(session.getUsername());
+
+ Roles roles = new Roles();
+ if(session.getRoles() != null)
+ {
+ for(String roleName: session.getRoles())
+ roles.addName(roleName);
+ }
+
+ //Resource Component
+ URIResource resource = new URIResource();
+ resource.setUri(new URI(pojoBeingAccessed.getClass().getName()));
+
+ //Action Component
+ Object action = null;
+ if(methodBeingCalled.getName().startsWith("get"))
+ {
+ action = new Read();
+ }
+ else if(methodBeingCalled.getName().startsWith("set"))
+ {
+ action = new Write();
+ }
+
+ //Create an EnforcementContext and start the "Enforcement Phase" with the security framework
+ EnforcementContext context = new EnforcementContext();
+ context.setIgnoreCache(true);
+ context.setAttribute("pojo", resource);
+ context.setAttribute("method", action);
+ context.setAttribute("identity", identity);
+ context.setAttribute("roles", roles);
+
+ //Process the result from Enforcement Phase execution-------------------------------------------------------------------------------------------------------------
+ EnforcementResponse response = this.getEnforcer().checkAccess(context);
+
+ if(response.isAccessGranted())
+ {
+ //Access to the Pojo is granted.....Proceed..
+ return invocation.invokeNext();
+ }
+ else
+ {
+ //Throw appropriate exception or handle it according to what the requirements are.........
+ throw new IllegalAccessException("Pojo Access Denied!!!");
+ }
+ }
+ finally
+ {
+ }
+ }
+}
+ ]]>
+ </programlisting>
+ </para>
+ </sect3>
+ <sect3>
+ <title>Sample Code: Provisioning Layer</title>
+ <para>
+ <programlisting>
+ <![CDATA[
+/**
+ * The Provisioning component that is in charge of managing the security policies of the application
+ *
+ * This is usually accessed via a GUI tool or the application's security dashboard etc
+ *
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class SecurityProvisioning
+{
+ private static Logger log = Logger.getLogger(SecurityProvisioning.class);
+
+ public void bootup()
+ {
+ try
+ {
+ // Provision POJO Policy
+ this.provisionPOJOPolicy();
+
+ Set<Policy> policies = this.getProvisioner().readAllPolicies();
+ for(Policy policy: policies)
+ {
+ log.info("------------------------------------------------------------------------------");
+ log.info(policy.generateSystemPolicy());
+ }
+ }
+ catch(Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ private void provisionPOJOPolicy() throws Exception
+ {
+ // SetUp Resource
+ URIResource resource = new URIResource();
+ resource.setUri(new URI(Pojo.class.getName()));
+
+ Read read = new Read();
+ Roles readRoles = new Roles();
+ readRoles.setMustMatchAll(false);
+ readRoles.addName("regular");
+ readRoles.addName("/blah1/blah2/blah3");
+
+ Write write = new Write();
+ Roles writeRoles = new Roles();
+ writeRoles.setMustMatchAll(false);
+ writeRoles.addName("admin");
+
+ // Setup the Context for the Composition with these components
+ CompositionContext context = new CompositionContext();
+ context.setPolicyTarget(resource);
+ context.addPolicyRule(Effect.PERMIT, read, readRoles,"allowExpression");
+ context.addPolicyRule(Effect.PERMIT, write, writeRoles,"allowExpression");
+
+ // Store the policy into the Policy Server
+ this.getProvisioner().deploy(context);
+ }
+
+ private PolicyProvisioner getProvisioner()
+ {
+ return (PolicyProvisioner) ServiceContainer.lookup("/agent/LocalPolicyProvisioner");
+ }
+}
+ ]]>
+ </programlisting>
+ </para>
+ </sect3>
+ </sect2>
+ </sect1>
+</chapter>
14 years, 7 months
- 1
- 0
JBoss Identity SVN: r799 - in identity-federation/trunk: jboss-identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2 and 1 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-09-17 14:17:49 -0400 (Thu, 17 Sep 2009)
New Revision: 799
Added:
identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/saml/v2/SAML2ObjectUnitTestCase.java
identity-federation/trunk/jboss-identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/SAML2Object.java
Modified:
identity-federation/trunk/jboss-identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/protocol/RequestAbstractType.java
identity-federation/trunk/jboss-identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/protocol/StatusResponseType.java
Log:
JBID-192: SAML2Object marker interface
Added: identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/saml/v2/SAML2ObjectUnitTestCase.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/saml/v2/SAML2ObjectUnitTestCase.java (rev 0)
+++ identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/saml/v2/SAML2ObjectUnitTestCase.java 2009-09-17 18:17:49 UTC (rev 799)
@@ -0,0 +1,54 @@
+/*
+ * 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.jboss.test.identity.federation.core.saml.v2;
+
+import org.jboss.identity.federation.saml.v2.SAML2Object;
+import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
+import org.jboss.identity.federation.saml.v2.protocol.LogoutRequestType;
+import org.jboss.identity.federation.saml.v2.protocol.ObjectFactory;
+import org.jboss.identity.federation.saml.v2.protocol.StatusResponseType;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit test the SAML2Object interface
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Sep 17, 2009
+ */
+public class SAML2ObjectUnitTestCase extends TestCase
+{
+ public void testSAML2Object()
+ {
+ ObjectFactory factory = new ObjectFactory();
+
+ //Request Types
+ LogoutRequestType lo = factory.createLogoutRequestType();
+ assertTrue("LogOutRequest is SAML2Object?", lo instanceof SAML2Object);
+
+ AuthnRequestType ar = factory.createAuthnRequestType();
+ assertTrue("AuthnRequest is SAML2Object?", ar instanceof SAML2Object);
+
+ //Response Types
+ StatusResponseType status = factory.createStatusResponseType();
+ assertTrue("StatusResponseType is SAML2Object?", status instanceof SAML2Object);
+ }
+}
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/SAML2Object.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/SAML2Object.java (rev 0)
+++ identity-federation/trunk/jboss-identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/SAML2Object.java 2009-09-17 18:17:49 UTC (rev 799)
@@ -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.jboss.identity.federation.saml.v2;
+
+/**
+ * Marker Interface
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Sep 17, 2009
+ */
+public interface SAML2Object
+{
+}
Modified: identity-federation/trunk/jboss-identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/protocol/RequestAbstractType.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/protocol/RequestAbstractType.java 2009-09-17 17:46:05 UTC (rev 798)
+++ identity-federation/trunk/jboss-identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/protocol/RequestAbstractType.java 2009-09-17 18:17:49 UTC (rev 799)
@@ -20,6 +20,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
+import org.jboss.identity.federation.saml.v2.SAML2Object;
import org.jboss.identity.federation.saml.v2.assertion.NameIDType;
import org.jboss.identity.xmlsec.w3.xmldsig.SignatureType;
@@ -65,7 +66,7 @@
AssertionIDRequestType.class,
AuthnRequestType.class
})
-public abstract class RequestAbstractType {
+public abstract class RequestAbstractType implements SAML2Object {
@XmlElement(name = "Issuer", namespace = "urn:oasis:names:tc:SAML:2.0:assertion")
protected NameIDType issuer;
Modified: identity-federation/trunk/jboss-identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/protocol/StatusResponseType.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/protocol/StatusResponseType.java 2009-09-17 17:46:05 UTC (rev 798)
+++ identity-federation/trunk/jboss-identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/protocol/StatusResponseType.java 2009-09-17 18:17:49 UTC (rev 799)
@@ -20,6 +20,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
+import org.jboss.identity.federation.saml.v2.SAML2Object;
import org.jboss.identity.federation.saml.v2.assertion.NameIDType;
import org.jboss.identity.xmlsec.w3.xmldsig.SignatureType;
@@ -64,7 +65,7 @@
ResponseType.class,
NameIDMappingResponseType.class
})
-public class StatusResponseType {
+public class StatusResponseType implements SAML2Object {
@XmlElement(name = "Issuer", namespace = "urn:oasis:names:tc:SAML:2.0:assertion")
protected NameIDType issuer;
14 years, 7 months
- 1
- 0
JBoss Identity SVN: r798 - idm/trunk/idm-testsuite/src/test/resources.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-09-17 13:46:05 -0400 (Thu, 17 Sep 2009)
New Revision: 798
Modified:
idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml
Log:
fix MSAD test
Modified: idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml 2009-09-17 17:39:12 UTC (rev 797)
+++ idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml 2009-09-17 17:46:05 UTC (rev 798)
@@ -923,12 +923,12 @@
<name>authenticationMethod</name>
<value>simple</value>
</option>
+ <!--<option>-->
+ <!--<name>customSystemProperties</name>-->
+ <!--<value>javax.net.ssl.trustStore=d:\Workshop\dev44-msad.truststore</value>-->
+ <!--<value>javax.net.ssl.trustStorePassword=password</value>-->
+ <!--</option>-->
<option>
- <name>customSystemProperties</name>
- <value>javax.net.ssl.trustStore=d:\Workshop\dev44-msad.truststore</value>
- <value>javax.net.ssl.trustStorePassword=password</value>
- </option>
- <option>
<name>searchTimeLimit</name>
<value>10000</value>
</option>
14 years, 7 months
- 1
- 0
JBoss Identity SVN: r797 - idm/trunk/idm-testsuite/src/test/resources.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-09-17 13:39:12 -0400 (Thu, 17 Sep 2009)
New Revision: 797
Modified:
idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml
Log:
fix MSAD tests
Modified: idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml 2009-09-17 08:03:35 UTC (rev 796)
+++ idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml 2009-09-17 17:39:12 UTC (rev 797)
@@ -577,6 +577,7 @@
<value>objectClass=top</value>
<value>objectClass=inetOrgPerson</value>
<value>sn= </value>
+ <value>userAccountControl=514</value>
<!--<value>cn= </value>-->
</option>
<option>
@@ -644,6 +645,7 @@
<name>createEntryAttributeValues</name>
<value>objectClass=top</value>
<value>objectClass=group</value>
+ <value>groupType=8</value>
</option>
</options>
</identity-object-type>
@@ -702,6 +704,8 @@
<name>createEntryAttributeValues</name>
<value>objectClass=top</value>
<value>objectClass=group</value>
+ <value>groupType=8</value>
+
</option>
</options>
</identity-object-type>
@@ -756,6 +760,7 @@
<name>createEntryAttributeValues</name>
<value>objectClass=top</value>
<value>objectClass=group</value>
+ <value>groupType=8</value>
</option>
</options>
</identity-object-type>
@@ -802,6 +807,7 @@
<name>createEntryAttributeValues</name>
<value>objectClass=top</value>
<value>objectClass=group</value>
+ <value>groupType=8</value>
</option>
</options>
</identity-object-type>
@@ -848,6 +854,7 @@
<name>createEntryAttributeValues</name>
<value>objectClass=top</value>
<value>objectClass=group</value>
+ <value>groupType=8</value>
</option>
</options>
</identity-object-type>
@@ -894,6 +901,7 @@
<name>createEntryAttributeValues</name>
<value>objectClass=top</value>
<value>objectClass=group</value>
+ <value>groupType=8</value>
</option>
</options>
</identity-object-type>
@@ -911,16 +919,16 @@
<name>adminPassword</name>
<value>jboss42</value>
</option>
- <!--<option>-->
- <!--<name>customJNDIConnectionParameters</name>-->
- <!--<value>java.naming.security.protocol=ssl</value>-->
- <!--</option>-->
- <!--<option>-->
- <!--<name>customSystemProperties</name>-->
- <!--<value>javax.net.ssl.trustStore=d:\Workshop\dev44-msad.truststore</value>-->
- <!--<value>javax.net.ssl.trustStorePassword=password</value>-->
- <!--</option>-->
<option>
+ <name>authenticationMethod</name>
+ <value>simple</value>
+ </option>
+ <option>
+ <name>customSystemProperties</name>
+ <value>javax.net.ssl.trustStore=d:\Workshop\dev44-msad.truststore</value>
+ <value>javax.net.ssl.trustStorePassword=password</value>
+ </option>
+ <option>
<name>searchTimeLimit</name>
<value>10000</value>
</option>
14 years, 7 months
- 1
- 0
JBoss Identity SVN: r796 - idm/trunk/idm-testsuite/src/test/resources/datasources.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-09-17 04:03:35 -0400 (Thu, 17 Sep 2009)
New Revision: 796
Modified:
idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
Log:
mysql5 settings fix
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-09-16 17:57:41 UTC (rev 795)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-09-17 08:03:35 UTC (rev 796)
@@ -137,7 +137,7 @@
<datasource>
<datasource-name>mysql5</datasource-name>
- <connection-url>jdbc:mysql://dev02.qa.atl.jboss.com/identity?jdbcCompliantTruncation=false</connection-url>
+ <connection-url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/identity?jdbcCompliantTrunca...</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
<user-name>identity</user-name>
<password>identity</password>
14 years, 7 months
- 1
- 0
JBoss Identity SVN: r795 - idm/trunk/idm-testsuite/src/test/resources/datasources.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-09-16 13:57:41 -0400 (Wed, 16 Sep 2009)
New Revision: 795
Modified:
idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
Log:
update QA lab setup
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-09-16 14:09:44 UTC (rev 794)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/datasources.xml 2009-09-16 17:57:41 UTC (rev 795)
@@ -89,49 +89,57 @@
<datasource>
<datasource-name>postgresql8</datasource-name>
- <connection-url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:portal</connection-url>
+ <connection-url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:identity</connection-url>
<driver-class>org.postgresql.Driver</driver-class>
- <user-name>portal</user-name>
- <password>password</password>
+ <user-name>identity</user-name>
+ <password>identity</password>
</datasource>
<datasource>
<datasource-name>sqlserver</datasource-name>
- <connection-url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/portal</connection-url>
+ <connection-url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/identity</connection-url>
<driver-class>net.sourceforge.jtds.jdbc.Driver</driver-class>
- <user-name>portal</user-name>
- <password>password</password>
+ <user-name>identity</user-name>
+ <password>identity</password>
</datasource>
<datasource>
<datasource-name>oracle9i</datasource-name>
<connection-url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</connection-url>
<driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
- <user-name>portal</user-name>
- <password>password</password>
+ <user-name>identity</user-name>
+ <password>identity</password>
</datasource>
<datasource>
<datasource-name>oracle10g</datasource-name>
- <connection-url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</connection-url>
+ <connection-url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</connection-url>
<driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
- <user-name>portal</user-name>
- <password>password</password>
+ <user-name>identity</user-name>
+ <password>identity</password>
</datasource>
+ <datasource>
+ <datasource-name>oracle11</datasource-name>
+ <connection-url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</connection-url>
+ <driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
+ <user-name>identity</user-name>
+ <password>identity</password>
+ </datasource>
+
<datasource>
<datasource-name>mysql4</datasource-name>
- <connection-url>jdbc:mysql://dev01.qa.atl.jboss.com/portal</connection-url>
+ <connection-url>jdbc:mysql://dev01.qa.atl.jboss.com/identity</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
- <user-name>portal</user-name>
- <password>password</password>
+ <user-name>identity</user-name>
+ <password>identity</password>
</datasource>
<datasource>
<datasource-name>mysql5</datasource-name>
- <connection-url>jdbc:mysql://dev02.qa.atl.jboss.com/portal?jdbcCompliantTruncation=false</connection-url>
+ <connection-url>jdbc:mysql://dev02.qa.atl.jboss.com/identity?jdbcCompliantTruncation=false</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
- <user-name>portal</user-name>
- <password>password</password>
+ <user-name>identity</user-name>
+ <password>identity</password>
</datasource>
</datasources>
Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml
===================================================================
--- idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-09-16 14:09:44 UTC (rev 794)
+++ idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-09-16 17:57:41 UTC (rev 795)
@@ -61,7 +61,7 @@
<properties>
<property>
<name>hibernate.dialect</name>
- <value>org.hibernate.dialect.Oracle9Dialect</value>
+ <value>org.hibernate.dialect.Oracle9iDialect</value>
</property>
<!-- Needed in order to avoid the bug described in HBX-146 to happen in instance container test case -->
<property>
@@ -75,7 +75,7 @@
<properties>
<property>
<name>hibernate.dialect</name>
- <value>org.hibernate.dialect.Oracle9Dialect</value>
+ <value>org.hibernate.dialect.Oracle9iDialect</value>
</property>
<!-- Needed in order to avoid the bug described in HBX-146 to happen in instance container test case -->
<property>
@@ -90,7 +90,7 @@
<properties>
<property>
<name>hibernate.dialect</name>
- <value>org.hibernate.dialect.Oracle9Dialect</value>
+ <value>org.hibernate.dialect.Oracle10gDialect</value>
</property>
<!-- Needed in order to avoid the bug described in HBX-146 to happen in instance container test case -->
<!--<property>-->
@@ -104,7 +104,7 @@
<properties>
<property>
<name>hibernate.dialect</name>
- <value>org.hibernate.dialect.Oracle9Dialect</value>
+ <value>org.hibernate.dialect.Oracle10gDialect</value>
</property>
<!-- Needed in order to avoid the bug described in HBX-146 to happen in instance container test case -->
<!--<property>-->
@@ -113,6 +113,21 @@
<!--</property>-->
</properties>
</configuration>
+ <!-- The oracle 10g configuration -->
+ <configuration>
+ <configuration-name>oracle11</configuration-name>
+ <properties>
+ <property>
+ <name>hibernate.dialect</name>
+ <value>org.hibernate.dialect.Oracle10gDialect</value>
+ </property>
+ <!-- Needed in order to avoid the bug described in HBX-146 to happen in instance container test case -->
+ <!--<property>-->
+ <!--<name>hibernate.cache.use_second_level_cache</name>-->
+ <!--<value>true</value>-->
+ <!--</property>-->
+ </properties>
+ </configuration>
<!-- The sqlserver configuration -->
<configuration>
<configuration-name>sqlserver</configuration-name>
14 years, 7 months
- 1
- 0
JBoss Identity SVN: r794 - in identity-federation/trunk: jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust and 1 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: sguilhen(a)redhat.com
Date: 2009-09-16 10:09:44 -0400 (Wed, 16 Sep 2009)
New Revision: 794
Modified:
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/JBossSTSUnitTestCase.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardRequestHandler.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/WSTrustConstants.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/WSTrustRequestContext.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/WSTrustUtil.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java
Log:
JBID-138: added symmetric key logic to StandardRequestHandler
Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/JBossSTSUnitTestCase.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/JBossSTSUnitTestCase.java 2009-09-14 22:54:54 UTC (rev 793)
+++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/JBossSTSUnitTestCase.java 2009-09-16 14:09:44 UTC (rev 794)
@@ -48,6 +48,7 @@
import org.jboss.identity.federation.core.wstrust.WSTrustException;
import org.jboss.identity.federation.core.wstrust.WSTrustJAXBFactory;
import org.jboss.identity.federation.core.wstrust.WSTrustRequestHandler;
+import org.jboss.identity.federation.core.wstrust.WSTrustUtil;
import org.jboss.identity.federation.core.wstrust.plugins.saml.SAML20TokenProvider;
import org.jboss.identity.federation.core.wstrust.plugins.saml.SAMLUtil;
import org.jboss.identity.federation.core.wstrust.wrappers.BaseRequestSecurityTokenResponse;
@@ -65,6 +66,9 @@
import org.jboss.identity.federation.ws.addressing.EndpointReferenceType;
import org.jboss.identity.federation.ws.addressing.ObjectFactory;
import org.jboss.identity.federation.ws.policy.AppliesTo;
+import org.jboss.identity.federation.ws.trust.BinarySecretType;
+import org.jboss.identity.federation.ws.trust.EntropyType;
+import org.jboss.identity.federation.ws.trust.RequestedProofTokenType;
import org.jboss.identity.federation.ws.trust.RequestedReferenceType;
import org.jboss.identity.federation.ws.trust.RequestedSecurityTokenType;
import org.jboss.identity.federation.ws.trust.StatusType;
@@ -182,7 +186,7 @@
assertNotNull("Unexpected null token provider", provider);
assertTrue("Unexpected token provider type", provider instanceof SAML20TokenProvider);
assertNull(config.getProviderForTokenElementNS("SpecialToken", "InvalidNamespace"));
-
+
// check the service provider -> token type mapping.
assertEquals("Invalid token type for service provider 1", "http://www.tokens.org/SpecialToken", config
.getTokenTypeForService("http://services.testcorp.org/provider1"));
@@ -363,6 +367,91 @@
/**
* <p>
+ * This test requests a security token specifying a key type (symmetric or public). The generated security token
+ * should include the key as a proof-of-possession token. In the symmetric key case, the WS-Trust response should
+ * also include either the computed key (when client key is combined with the key generated by the STS) or the key
+ * generated by the STS (when client keys is not specified and is up to the STS to create one).
+ * </p>
+ *
+ * @throws Exception if an error occurs while running the test.
+ */
+ @SuppressWarnings("unchecked")
+ public void testInvokeSAML20WithProofToken() throws Exception
+ {
+ // create a simple token request, asking for a SAMLv2.0 token.
+ RequestSecurityToken request = this.createRequest("testcontext", WSTrustConstants.ISSUE_REQUEST,
+ SAMLUtil.SAML2_TOKEN_TYPE, null);
+
+ // add a symmetric key type to the request, but don't supply any client key - STS should generate one.
+ request.setKeyType(URI.create(WSTrustConstants.KEY_TYPE_SYMMETRIC));
+
+ // use the factory to marshall the request.
+ WSTrustJAXBFactory factory = WSTrustJAXBFactory.getInstance();
+ Source requestMessage = factory.marshallRequestSecurityToken(request);
+
+ // invoke the token service.
+ Source responseMessage = this.tokenService.invoke(requestMessage);
+ BaseRequestSecurityTokenResponse baseResponse = WSTrustJAXBFactory.getInstance()
+ .parseRequestSecurityTokenResponse(responseMessage);
+
+ // validate the security token response.
+ this.validateSAMLAssertionResponse(baseResponse);
+
+ // check if the response contains the STS-generated key.
+ RequestSecurityTokenResponseCollection collection = (RequestSecurityTokenResponseCollection) baseResponse;
+ RequestSecurityTokenResponse response = collection.getRequestSecurityTokenResponses().get(0);
+ RequestedProofTokenType proofToken = response.getRequestedProofToken();
+ assertNotNull("Unexpected null proof token", proofToken);
+ assertTrue(proofToken.getAny() instanceof JAXBElement);
+ JAXBElement proofElement = (JAXBElement) proofToken.getAny();
+ assertEquals("Unexpected proof token content", BinarySecretType.class, proofElement.getDeclaredType());
+ BinarySecretType serverBinarySecret = (BinarySecretType) proofElement.getValue();
+ assertNotNull("Unexpected null secret", serverBinarySecret.getValue());
+ // default key size is 256 bits (32 bytes).
+ assertEquals("Unexpected secret size", 32, serverBinarySecret.getValue().length);
+
+ // let's now create a request that specifies the client entropy using a 512 bits secret.
+ byte[] clientSecret = WSTrustUtil.createRandomSecret(64);
+ BinarySecretType clientBinarySecret = new BinarySecretType();
+ clientBinarySecret.setType(WSTrustConstants.BS_TYPE_NONCE);
+ clientBinarySecret.setValue(clientSecret);
+ EntropyType clientEntropy = new EntropyType();
+ clientEntropy.getAny().add(
+ new org.jboss.identity.federation.ws.trust.ObjectFactory().createBinarySecret(clientBinarySecret));
+ request.setEntropy(clientEntropy);
+ request.setKeySize(512);
+
+ // invoke the token service.
+ requestMessage = factory.marshallRequestSecurityToken(request);
+ responseMessage = this.tokenService.invoke(requestMessage);
+ baseResponse = WSTrustJAXBFactory.getInstance().parseRequestSecurityTokenResponse(responseMessage);
+
+ // validate the security token response.
+ this.validateSAMLAssertionResponse(baseResponse);
+
+ collection = (RequestSecurityTokenResponseCollection) baseResponse;
+ response = collection.getRequestSecurityTokenResponses().get(0);
+ proofToken = response.getRequestedProofToken();
+ assertNotNull("Unexpected null proof token", proofToken);
+ assertTrue(proofToken.getAny() instanceof JAXBElement);
+ proofElement = (JAXBElement) proofToken.getAny();
+ // proof token should contain only the computed key algorithm.
+ assertEquals("Unexpected proof token content", "ComputedKey", proofElement.getName().getLocalPart());
+ assertEquals("Unexpected computed key algorithm", WSTrustConstants.CK_PSHA1, proofElement.getValue());
+ // server entropy must have been included in the response to allow construction of the computed key.
+ EntropyType serverEntropy = response.getEntropy();
+ assertNotNull("Unexpected null server entropy");
+ assertEquals("Invalid number of elements in server entropy", 1, serverEntropy.getAny().size());
+ JAXBElement serverEntropyContent = (JAXBElement) serverEntropy.getAny().get(0);
+ assertEquals("Unexpected proof token content", BinarySecretType.class, serverEntropyContent.getDeclaredType());
+ serverBinarySecret = (BinarySecretType) serverEntropyContent.getValue();
+ assertEquals("Unexpected binary secret type", WSTrustConstants.BS_TYPE_NONCE, serverBinarySecret.getType());
+ assertNotNull("Unexpected null secret value", serverBinarySecret.getValue());
+ assertEquals("Unexpected secret size", 64, serverBinarySecret.getValue().length);
+ }
+
+ /**
+ * <p>
* This test case first generates a SAMLV2.0 assertion and then sends a WS-Trust validate message to the STS to get
* the assertion validated, checking the validation results.
* </p>
@@ -382,8 +471,7 @@
// invoke the token service.
Source responseMessage = this.tokenService.invoke(requestMessage);
- BaseRequestSecurityTokenResponse baseResponse = factory
- .parseRequestSecurityTokenResponse(responseMessage);
+ BaseRequestSecurityTokenResponse baseResponse = factory.parseRequestSecurityTokenResponse(responseMessage);
// get the SAML assertion from the request.
RequestSecurityTokenResponseCollection collection = (RequestSecurityTokenResponseCollection) baseResponse;
@@ -457,12 +545,11 @@
}
catch (WebServiceException we)
{
- assertEquals("Unexpected exception message", "Exception in handling token request:", we
- .getMessage());
+ assertEquals("Unexpected exception message", "Exception in handling token request:", we.getMessage());
assertNotNull("Unexpected null cause", we.getCause());
assertTrue("Unexpected cause type", we.getCause() instanceof WSTrustException);
assertEquals("Unexpected exception message", "Unable to find a token provider for the token request", we
- .getCause().getMessage());
+ .getCause().getMessage());
}
}
@@ -501,9 +588,9 @@
assertTrue("Unexpected token class", token instanceof Element);
Element element = (Element) requestedToken.getAny();
assertEquals("Unexpected namespace value", "http://www.tokens.org", element.getNamespaceURI());
-
- assertEquals("Unexpected attribute value", "http://www.tokens.org/SpecialToken", element
- .getAttributeNS("http://www.tokens.org", "TokenType"));
+
+ assertEquals("Unexpected attribute value", "http://www.tokens.org/SpecialToken", element.getAttributeNS(
+ "http://www.tokens.org", "TokenType"));
assertEquals("Unexpected token value", "Principal:sguilhen", element.getFirstChild().getNodeValue());
}
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardRequestHandler.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardRequestHandler.java 2009-09-14 22:54:54 UTC (rev 793)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardRequestHandler.java 2009-09-16 14:09:44 UTC (rev 794)
@@ -22,10 +22,13 @@
package org.jboss.identity.federation.core.wstrust;
import java.net.URI;
+import java.security.InvalidKeyException;
import java.security.KeyPair;
+import java.security.NoSuchAlgorithmException;
import java.security.Principal;
import java.security.PublicKey;
+import javax.xml.bind.JAXBElement;
import javax.xml.crypto.dsig.DigestMethod;
import javax.xml.crypto.dsig.SignatureMethod;
@@ -36,6 +39,10 @@
import org.jboss.identity.federation.core.wstrust.wrappers.RequestSecurityToken;
import org.jboss.identity.federation.core.wstrust.wrappers.RequestSecurityTokenResponse;
import org.jboss.identity.federation.ws.policy.AppliesTo;
+import org.jboss.identity.federation.ws.trust.BinarySecretType;
+import org.jboss.identity.federation.ws.trust.EntropyType;
+import org.jboss.identity.federation.ws.trust.ObjectFactory;
+import org.jboss.identity.federation.ws.trust.RequestedProofTokenType;
import org.jboss.identity.federation.ws.trust.RequestedSecurityTokenType;
import org.jboss.identity.federation.ws.trust.StatusType;
import org.w3c.dom.Document;
@@ -57,6 +64,8 @@
private boolean trace = log.isTraceEnabled();
+ private static long KEY_SIZE = 256;
+
private STSConfiguration configuration;
/*
@@ -118,50 +127,78 @@
request.setLifetime(WSTrustUtil.createDefaultLifetime(this.configuration.getIssuedTokenTimeout()));
}
requestContext.setServiceProviderPublicKey(providerPublicKey);
- provider.issueToken(requestContext);
- if (requestContext.getSecurityToken() == null)
- throw new WSTrustException("Token issued by provider " + provider.getClass().getName() + " is null");
+ // get the key type and size from the request, setting default values if not specified.
+ URI keyType = request.getKeyType();
+ if (keyType == null)
+ {
+ keyType = URI.create(WSTrustConstants.KEY_TYPE_BEARER);
+ request.setKeyType(keyType);
+ }
+ long keySize = request.getKeySize();
+ if (keySize == 0)
+ {
+ keySize = KEY_SIZE;
+ request.setKeySize(keySize);
+ }
- // sign the issued token if needed.
- /*if (this.configuration.signIssuedToken() && this.configuration.getSTSKeyPair() != null)
+ // create proof-of-possession token and server entropy (if needed).
+ RequestedProofTokenType requestedProofToken = null;
+ EntropyType serverEntropy = null;
+
+ if (WSTrustConstants.KEY_TYPE_SYMMETRIC.equalsIgnoreCase(keyType.toString()))
{
- KeyPair keyPair = this.configuration.getSTSKeyPair();
- if (keyPair != null)
+ requestedProofToken = new RequestedProofTokenType();
+ ObjectFactory objFactory = new ObjectFactory();
+ // symmetric key case: if client entropy is found, compute a key. If not, generate a new key.
+ byte[] clientSecret = null;
+ EntropyType clientEntropy = request.getEntropy();
+ if (clientEntropy != null)
+ clientSecret = WSTrustUtil.getBinarySecret(clientEntropy);
+
+ byte[] serverSecret = WSTrustUtil.createRandomSecret((int) keySize / 8);
+ BinarySecretType serverBinarySecret = new BinarySecretType();
+ serverBinarySecret.setType(WSTrustConstants.BS_TYPE_NONCE);
+ serverBinarySecret.setValue(serverSecret);
+ serverEntropy = new EntropyType();
+ serverEntropy.getAny().add(objFactory.createBinarySecret(serverBinarySecret));
+
+ if (clientSecret != null && clientSecret.length != 0)
{
- URI signatureURI = request.getSignatureAlgorithm();
- String signatureMethod = signatureURI != null ? signatureURI.toString() : SignatureMethod.RSA_SHA1;
+ // client secret has been specified - combine it with the sts secret.
+ requestedProofToken.setAny(objFactory.createComputedKey(WSTrustConstants.CK_PSHA1));
try
{
- Element tokenElement = (Element) requestContext.getSecurityToken().getTokenValue();
- XMLSignatureUtil.sign(tokenElement.getOwnerDocument(), keyPair, DigestMethod.SHA1, signatureMethod,
- "#" + requestContext.getSecurityToken().getTokenID());
- if(trace)
- {
- try
- {
- log.trace("Signed Token:" + DocumentUtil.getNodeAsString(tokenElement));
-
- Document tokenDocument = DocumentUtil.createDocument();
- tokenDocument.appendChild(tokenDocument.importNode(tokenElement, true));
- log.trace("valid=" + XMLSignatureUtil.validate(tokenDocument, keyPair.getPublic()));
-
- }catch(Exception ignore){}
- }
+ byte[] combinedSecret = WSTrustUtil.P_SHA1(clientSecret, serverSecret, (int) keySize / 8);
+ requestContext.setProofToken(combinedSecret);
}
catch (Exception e)
{
- throw new WSTrustException("Failed to sign security token", e);
+ throw new WSTrustException("Error generating combined secret key", e);
}
}
- }*/
+ else
+ {
+ // client secret has not been specified - use the sts secret only.
+ requestedProofToken.setAny(objFactory.createBinarySecret(serverBinarySecret));
+ requestContext.setProofToken(serverSecret);
+ }
+ }
+ else if (WSTrustConstants.KEY_TYPE_PUBLIC.equalsIgnoreCase(keyType.toString()))
+ {
+ // TODO: implement public key case.
+ }
+ // issue the security token using the constructed context.
+ provider.issueToken(requestContext);
+
+ if (requestContext.getSecurityToken() == null)
+ throw new WSTrustException("Token issued by provider " + provider.getClass().getName() + " is null");
+
// construct the ws-trust security token response.
RequestedSecurityTokenType requestedSecurityToken = new RequestedSecurityTokenType();
requestedSecurityToken.setAny(requestContext.getSecurityToken().getTokenValue());
- // TODO: create proof token and encrypt the token if needed
-
RequestSecurityTokenResponse response = new RequestSecurityTokenResponse();
if (request.getContext() != null)
response.setContext(request.getContext());
@@ -170,7 +207,12 @@
response.setLifetime(request.getLifetime());
response.setAppliesTo(appliesTo);
response.setRequestedSecurityToken(requestedSecurityToken);
-
+
+ if(requestedProofToken != null)
+ response.setRequestedProofToken(requestedProofToken);
+ if(serverEntropy != null)
+ response.setEntropy(serverEntropy);
+
// set the attached and unattached references.
if (requestContext.getAttachedReference() != null)
response.setRequestedAttachedReference(requestContext.getAttachedReference());
@@ -283,11 +325,11 @@
request.setTokenType(URI.create(WSTrustConstants.STATUS_TYPE));
Node securityToken = request.getValidateTargetElement().getFirstChild();
- SecurityTokenProvider provider = this.configuration.getProviderForTokenElementNS(
- securityToken.getLocalName(), securityToken.getNamespaceURI());
+ SecurityTokenProvider provider = this.configuration.getProviderForTokenElementNS(securityToken.getLocalName(),
+ securityToken.getNamespaceURI());
if (provider == null)
- throw new WSTrustException("No SecurityTokenProvider configured for "
- + securityToken.getNamespaceURI() + ":" + securityToken.getLocalName());
+ throw new WSTrustException("No SecurityTokenProvider configured for " + securityToken.getNamespaceURI() + ":"
+ + securityToken.getLocalName());
WSTrustRequestContext context = new WSTrustRequestContext(request, callerPrincipal);
@@ -328,7 +370,7 @@
}
// TODO: add logging statements alerting that signature validation was not performed.
- // if the signature is valid, then let the provider handle perform any additional validation checks.
+ // if the signature is valid, then let the provider perform any additional validation checks.
if (status == null)
{
provider.validateToken(context);
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/WSTrustConstants.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/WSTrustConstants.java 2009-09-14 22:54:54 UTC (rev 793)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/WSTrustConstants.java 2009-09-16 14:09:44 UTC (rev 794)
@@ -43,6 +43,19 @@
public static final String STATUS_CODE_VALID = BASE_NAMESPACE + "status/valid";
public static final String STATUS_CODE_INVALID = BASE_NAMESPACE + "status/invalid";
+ // WS-Trust key types.
+ public static final String KEY_TYPE_BEARER = BASE_NAMESPACE + "Bearer";
+ public static final String KEY_TYPE_SYMMETRIC = BASE_NAMESPACE + "SymmetricKey";
+ public static final String KEY_TYPE_PUBLIC = BASE_NAMESPACE + "PublicKey";
+
+ // WS-Trust binary secret types.
+ public static final String BS_TYPE_ASYMMETRIC = BASE_NAMESPACE + "AsymmetricKey";
+ public static final String BS_TYPE_SYMMETRIC = BASE_NAMESPACE + "SymmetricKey";
+ public static final String BS_TYPE_NONCE = BASE_NAMESPACE + "Nonce";
+
+ // WS-Trust computed key types.
+ public static final String CK_PSHA1 = BASE_NAMESPACE + "CK/PSHA1";
+
// WSS namespaces values.
public static final String WSA_NS = "http://www.w3.org/2005/08/addressing";
public static final String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...";
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/WSTrustRequestContext.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/WSTrustRequestContext.java 2009-09-14 22:54:54 UTC (rev 793)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/WSTrustRequestContext.java 2009-09-16 14:09:44 UTC (rev 794)
@@ -49,6 +49,8 @@
private final RequestSecurityToken request;
+ private Object proofToken;
+
// information supplied by the token provider.
private SecurityToken securityToken;
@@ -147,9 +149,33 @@
/**
* <p>
- * Obtains the security token contained in this context.
+ * Obtains the proof-of-possession token.
* </p>
*
+ * @return an {@code Object} representing the proof-of-possession token.
+ */
+ public Object getProofToken()
+ {
+ return this.proofToken;
+ }
+
+ /**
+ * <p>
+ * Sets the proof-of-possession token in the request context.
+ * </p>
+ *
+ * @param proofToken an {@code Object} representing the proof-of-possession token.
+ */
+ public void setProofToken(Object proofToken)
+ {
+ this.proofToken = proofToken;
+ }
+
+ /**
+ * <p>
+ * Obtains the security token set by the token provider.
+ * </p>
+ *
* @return a reference to the {@code SecurityToken} instance.
*/
public SecurityToken getSecurityToken()
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/WSTrustUtil.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/WSTrustUtil.java 2009-09-14 22:54:54 UTC (rev 793)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/WSTrustUtil.java 2009-09-16 14:09:44 UTC (rev 794)
@@ -21,9 +21,14 @@
*/
package org.jboss.identity.federation.core.wstrust;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
import java.util.GregorianCalendar;
import java.util.Map;
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
@@ -32,6 +37,8 @@
import org.jboss.identity.federation.ws.addressing.EndpointReferenceType;
import org.jboss.identity.federation.ws.addressing.ObjectFactory;
import org.jboss.identity.federation.ws.policy.AppliesTo;
+import org.jboss.identity.federation.ws.trust.BinarySecretType;
+import org.jboss.identity.federation.ws.trust.EntropyType;
import org.jboss.identity.federation.ws.trust.RequestedReferenceType;
import org.jboss.identity.federation.ws.wss.secext.KeyIdentifierType;
import org.jboss.identity.federation.ws.wss.secext.SecurityTokenReferenceType;
@@ -43,6 +50,7 @@
*
* @author <a href="mailto:sguilhen@redhat.com">Stefan Guilhen</a>
*/
+@SuppressWarnings("unchecked")
public class WSTrustUtil
{
@@ -62,7 +70,7 @@
keyIdentifier.setValue(value);
return keyIdentifier;
}
-
+
/**
* <p>
* Creates an instance of {@code RequestedReferenceType} with the specified values. This method first creates a
@@ -86,7 +94,7 @@
return reference;
}
-
+
/**
* <p>
* Creates an instance of {@code AppliesTo} using the specified endpoint address.
@@ -154,4 +162,105 @@
return new Lifetime(created, expires);
}
+ /**
+ * <p>
+ * Parses the specified {@code EntropyType} and returns the first binary secret contained in the entropy.
+ * </p>
+ *
+ * @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.
+ */
+ public static byte[] getBinarySecret(EntropyType entropy)
+ {
+ byte[] secret = null;
+
+ for (Object obj : entropy.getAny())
+ {
+ JAXBElement element = (JAXBElement) obj;
+ if (element.getDeclaredType().equals(BinarySecretType.class))
+ {
+ BinarySecretType binarySecret = (BinarySecretType) element.getValue();
+ secret = binarySecret.getValue();
+ break;
+ }
+ }
+ return secret;
+ }
+
+ /**
+ * <p>
+ * Creates a random {@code byte[]} secret of the specified size.
+ * </p>
+ * @param size the size of the secret to be created, in bytes.
+ * @return a {@code byte[]} containing the generated secret.
+ */
+ public static byte[] createRandomSecret(final int size)
+ {
+ SecureRandom random = new SecureRandom();
+ byte[] secret = new byte[size];
+ random.nextBytes(secret);
+ return secret;
+ }
+
+ /**
+ * <p>
+ * This method implements the {@code P_SHA-1} function as defined in the <i>RFC 2246 - The TLS Protocol Version 1.0
+ * Section 5. HMAC and the pseudorandom function</i>:
+ *
+ * <pre>
+ * P_hash(secret, seed) = HMAC_hash(secret, A(1) + seed) +
+ * HMAC_hash(secret, A(2) + seed) +
+ * HMAC_hash(secret, A(3) + seed) + ...
+ *
+ * Where + indicates concatenation.
+ *
+ * A() is defined as:
+ * A(0) = seed
+ * A(i) = HMAC_hash(secret, A(i-1))
+ * </pre>
+ * </p>
+ *
+ * @param secret a {@code byte[]} that represents the HMAC secret.
+ * @param seed a {@code byte[]} that represents the seed to be used.
+ * @param requiredSize an {@code int} that specifies the size (in bytes) of the result.
+ * @return a {@code byte[]} containing the result of the {@code P_SHA-1} function.
+ * @throws NoSuchAlgorithmException if an error occurs while creating the {@code Mac} instance.
+ * @throws InvalidKeyException if an error occurs while initializing the {@code Mac} instance.
+ */
+ public static byte[] P_SHA1(byte[] secret, byte[] seed, int requiredSize) throws NoSuchAlgorithmException,
+ InvalidKeyException
+ {
+ int offset = 0, copySize;
+ byte[] result = new byte[requiredSize];
+ byte[] A, partialResult;
+
+ SecretKeySpec key = new SecretKeySpec(secret, "HMACSHA1");
+ Mac mac = Mac.getInstance("HMACSHA1");
+
+ // initialize A - A(0) = seed
+ A = seed;
+ while (requiredSize > 0)
+ {
+ // calculate the value of A()
+ mac.init(key);
+ mac.update(A);
+ A = mac.doFinal();
+
+ // now calculate HMAC_hash(secret, A + seed)
+ mac.reset();
+ mac.init(key);
+ mac.update(A);
+ mac.update(seed);
+ partialResult = mac.doFinal();
+
+ // copy the necessary bytes to the result.
+ copySize = Math.min(requiredSize, partialResult.length);
+ System.arraycopy(partialResult, 0, result, offset, copySize);
+ offset += copySize;
+ requiredSize -= copySize;
+ }
+ return result;
+ }
+
}
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java 2009-09-14 22:54:54 UTC (rev 793)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java 2009-09-16 14:09:44 UTC (rev 794)
@@ -592,7 +592,7 @@
* Obtains the size of they key that has been set in the request.
* </p>
*
- * @return a {@code long} representing the key size in bytes.
+ * @return a {@code long} representing the key size.
*/
public long getKeySize()
{
@@ -604,7 +604,7 @@
* Sets the size of the key in the request.
* </p>
*
- * @param keySize a {@code long} representing the key size in bytes.
+ * @param keySize a {@code long} representing the key size.
*/
public void setKeySize(long keySize)
{
14 years, 7 months
- 1
- 0
JBoss Identity SVN: r793 - in identity-federation/trunk: assembly and 27 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-09-14 18:54:54 -0400 (Mon, 14 Sep 2009)
New Revision: 793
Modified:
identity-federation/trunk/assembly/pom.xml
identity-federation/trunk/jboss-identity-bindings-jboss/pom.xml
identity-federation/trunk/jboss-identity-bindings/pom.xml
identity-federation/trunk/jboss-identity-fed-api/pom.xml
identity-federation/trunk/jboss-identity-fed-core/pom.xml
identity-federation/trunk/jboss-identity-fed-model/pom.xml
identity-federation/trunk/jboss-identity-seam/pom.xml
identity-federation/trunk/jboss-identity-web/pom.xml
identity-federation/trunk/jboss-identity-webapps/circleoftrust/pom.xml
identity-federation/trunk/jboss-identity-webapps/employee/pom.xml
identity-federation/trunk/jboss-identity-webapps/fed-example/pom.xml
identity-federation/trunk/jboss-identity-webapps/idp-sig-no-val/pom.xml
identity-federation/trunk/jboss-identity-webapps/idp-sig/pom.xml
identity-federation/trunk/jboss-identity-webapps/idp-standalone/pom.xml
identity-federation/trunk/jboss-identity-webapps/idp/pom.xml
identity-federation/trunk/jboss-identity-webapps/jboss-sts/pom.xml
identity-federation/trunk/jboss-identity-webapps/metadata/pom.xml
identity-federation/trunk/jboss-identity-webapps/openid-consumer/pom.xml
identity-federation/trunk/jboss-identity-webapps/openid-provider/pom.xml
identity-federation/trunk/jboss-identity-webapps/pdp/pom.xml
identity-federation/trunk/jboss-identity-webapps/pom.xml
identity-federation/trunk/jboss-identity-webapps/sales-post-sig/pom.xml
identity-federation/trunk/jboss-identity-webapps/sales-sig/pom.xml
identity-federation/trunk/jboss-identity-webapps/sales-standalone/pom.xml
identity-federation/trunk/jboss-identity-webapps/sales/pom.xml
identity-federation/trunk/jboss-identity-webapps/seam-sp/pom.xml
identity-federation/trunk/jboss-identity-xmlsec-model/pom.xml
identity-federation/trunk/parent/pom.xml
identity-federation/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: identity-federation/trunk/assembly/pom.xml
===================================================================
--- identity-federation/trunk/assembly/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/assembly/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: identity-federation/trunk/jboss-identity-bindings/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-bindings/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: identity-federation/trunk/jboss-identity-bindings-jboss/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-bindings-jboss/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-bindings-jboss/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: identity-federation/trunk/jboss-identity-fed-api/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-fed-api/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-fed-api/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: identity-federation/trunk/jboss-identity-fed-core/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-fed-core/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: identity-federation/trunk/jboss-identity-fed-model/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-fed-model/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-fed-model/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: identity-federation/trunk/jboss-identity-seam/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-seam/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-seam/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -3,7 +3,7 @@
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-parent
</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: identity-federation/trunk/jboss-identity-web/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-web/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-web/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: identity-federation/trunk/jboss-identity-webapps/circleoftrust/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/circleoftrust/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/circleoftrust/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>circleoftrust</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<packaging>war</packaging>
<name>JBoss Identity Federation Circle Of Trust</name>
<url>http://labs.jboss.org/portal/jbosssecurity/</url>
Modified: identity-federation/trunk/jboss-identity-webapps/employee/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/employee/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/employee/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/fed-example/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/fed-example/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/fed-example/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -3,7 +3,7 @@
<parent>
<artifactId>jboss-identity-federation-webapps</artifactId>
<groupId>org.jboss.identity</groupId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.identity</groupId>
<artifactId>fed-example</artifactId>
Modified: identity-federation/trunk/jboss-identity-webapps/idp/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/idp/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/idp/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/idp-sig/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/idp-sig/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/idp-sig/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/idp-sig-no-val/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/idp-sig-no-val/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/idp-sig-no-val/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/idp-standalone/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/idp-standalone/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/idp-standalone/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/jboss-sts/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/jboss-sts/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/jboss-sts/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/metadata/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/metadata/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/metadata/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/openid-consumer/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/openid-consumer/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/openid-consumer/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/openid-provider/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/openid-provider/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/openid-provider/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/pdp/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: identity-federation/trunk/jboss-identity-webapps/sales/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/sales/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/sales/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/sales-post-sig/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/sales-post-sig/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/sales-post-sig/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/sales-sig/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/sales-sig/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/sales-sig/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/sales-standalone/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/sales-standalone/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/sales-standalone/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: identity-federation/trunk/jboss-identity-webapps/seam-sp/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/seam-sp/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-webapps/seam-sp/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -14,19 +14,19 @@
<dependency>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-model</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-api</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-bindings</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: identity-federation/trunk/jboss-identity-xmlsec-model/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-xmlsec-model/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/jboss-identity-xmlsec-model/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: identity-federation/trunk/parent/pom.xml
===================================================================
--- identity-federation/trunk/parent/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/parent/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -8,7 +8,7 @@
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<name>JBoss Identity Federation- Parent</name>
<url>http://labs.jboss.org/portal/jbosssecurity/</url>
<description>JBoss Identity 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/jbossidentity/identity-federation/...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/identity-federation/tag...</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/identity-federation/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/identity-federation/tag...</developerConnection>
</scm>
<build>
Modified: identity-federation/trunk/pom.xml
===================================================================
--- identity-federation/trunk/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
+++ identity-federation/trunk/pom.xml 2009-09-14 22:54:54 UTC (rev 793)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta2</version>
+ <version>1.0.0.beta2-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years, 7 months
- 1
- 0
JBoss Identity SVN: r792 - in identity-federation/tags: 1.0.0.beta2 and 32 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-09-14 18:53:59 -0400 (Mon, 14 Sep 2009)
New Revision: 792
Added:
identity-federation/tags/1.0.0.beta2/
identity-federation/tags/1.0.0.beta2/assembly/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-bindings-jboss/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java
identity-federation/tags/1.0.0.beta2/jboss-identity-fed-api/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/StatementUtil.java
identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/saml/v2/X500AttributeUnitTestCase.java
identity-federation/tags/1.0.0.beta2/jboss-identity-fed-model/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-seam/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-web/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/circleoftrust/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/employee/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/fed-example/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig-no-val/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-standalone/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/jboss-sts/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/metadata/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-consumer/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-provider/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pdp/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-post-sig/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-sig/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-standalone/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/seam-sp/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-xmlsec-model/pom.xml
identity-federation/tags/1.0.0.beta2/parent/pom.xml
identity-federation/tags/1.0.0.beta2/pom.xml
Removed:
identity-federation/tags/1.0.0.beta2/assembly/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-bindings-jboss/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java
identity-federation/tags/1.0.0.beta2/jboss-identity-fed-api/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/StatementUtil.java
identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/saml/v2/X500AttributeUnitTestCase.java
identity-federation/tags/1.0.0.beta2/jboss-identity-fed-model/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-seam/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-web/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/circleoftrust/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/employee/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/fed-example/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig-no-val/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-standalone/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/jboss-sts/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/metadata/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-consumer/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-provider/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pdp/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-post-sig/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-sig/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-standalone/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/seam-sp/pom.xml
identity-federation/tags/1.0.0.beta2/jboss-identity-xmlsec-model/pom.xml
identity-federation/tags/1.0.0.beta2/parent/pom.xml
identity-federation/tags/1.0.0.beta2/pom.xml
Log:
[maven-release-plugin] copy for tag 1.0.0.beta2
Copied: identity-federation/tags/1.0.0.beta2 (from rev 789, identity-federation/trunk)
Deleted: identity-federation/tags/1.0.0.beta2/assembly/pom.xml
===================================================================
--- identity-federation/trunk/assembly/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/assembly/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,63 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed</artifactId>
- <packaging>pom</packaging>
- <name>JBoss Identity Federation- Assembly</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Federation</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifestEntries>
- <Specification-Title>JBoss Identity</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor>
- <Implementation-Title>JBoss Identity</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-VendorId>org.jboss.security</Implementation-VendorId>
- <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor>
- <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL>
- </manifestEntries>
- </archive>
- <descriptors>
- <descriptor>bin.xml</descriptor>
- <descriptor>sources.xml</descriptor>
- </descriptors>
- </configuration>
- <inherited>false</inherited>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: identity-federation/tags/1.0.0.beta2/assembly/pom.xml (from rev 791, identity-federation/trunk/assembly/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/assembly/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/assembly/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,63 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-parent</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Identity Federation- Assembly</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Federation</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Specification-Title>JBoss Identity</Specification-Title>
+ <Specification-Version>${project.version}</Specification-Version>
+ <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor>
+ <Implementation-Title>JBoss Identity</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-VendorId>org.jboss.security</Implementation-VendorId>
+ <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor>
+ <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL>
+ </manifestEntries>
+ </archive>
+ <descriptors>
+ <descriptor>bin.xml</descriptor>
+ <descriptor>sources.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <inherited>false</inherited>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,242 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-identity-bindings</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Identity Federation Server Bindings</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity OpenSAML contains the foundation for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <!-- Profile to exclude the integration tests that take long time -->
- <profiles>
- <profile>
- <id>exclude-long-tests</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>false</testFailureIgnore>
- <excludes>
- <exclude>**/integration/*TestCase.java</exclude>
- </excludes>
- <forkMode>pertest</forkMode>
- <argLine>${surefire.jvm.args}</argLine>
- . <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>long-tests</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <childDelegation>true</childDelegation>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/integration/*TestCase.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- <argLine>${surefire.jvm.args}</argLine>
- . <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
- <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-model</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-web</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache</groupId>
- <artifactId>httpclient</artifactId>
- <version>3.0.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>6.0.18</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>coyote</artifactId>
- <version>6.0.18</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>apache-tomcat</groupId>
- <artifactId>tomcat-util</artifactId>
- <version>5.5.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>apache-tomcat</groupId>
- <artifactId>naming-resources</artifactId>
- <version>5.5.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>apache-tomcat</groupId>
- <artifactId>tomcat-http</artifactId>
- <version>5.5.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>apache-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.0.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>apache-modeler</groupId>
- <artifactId>commons-modeler</artifactId>
- <version>1.1patch</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>sun-jaf</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doclet>org.jboss.apiviz.APIviz</doclet>
- <docletArtifact>
- <groupId>org.jboss.apiviz</groupId>
- <artifactId>apiviz</artifactId>
- <version>1.2.5.GA</version>
- </docletArtifact>
- <additionalparam>
- -charset UTF-8
- -docencoding UTF-8
- -version
- -author
- -breakiterator
- -windowtitle "${project.name} ${project.version} API Reference"
- -doctitle "${project.name} ${project.version} API Reference"
- -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
- -link http://java.sun.com/javase/6/docs/api/
- -sourceclasspath ${project.build.outputDirectory}
- </additionalparam>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-bindings/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,242 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-parent</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-identity-bindings</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Identity Federation Server Bindings</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity OpenSAML contains the foundation for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+
+ <!-- Profile to exclude the integration tests that take long time -->
+ <profiles>
+ <profile>
+ <id>exclude-long-tests</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <testFailureIgnore>false</testFailureIgnore>
+ <excludes>
+ <exclude>**/integration/*TestCase.java</exclude>
+ </excludes>
+ <forkMode>pertest</forkMode>
+ <argLine>${surefire.jvm.args}</argLine>
+ . <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>long-tests</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <childDelegation>true</childDelegation>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/integration/*TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>${surefire.jvm.args}</argLine>
+ . <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-web</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>3.0.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>6.0.18</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>coyote</artifactId>
+ <version>6.0.18</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ <version>5.5.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-tomcat</groupId>
+ <artifactId>naming-resources</artifactId>
+ <version>5.5.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-tomcat</groupId>
+ <artifactId>tomcat-http</artifactId>
+ <version>5.5.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-modeler</groupId>
+ <artifactId>commons-modeler</artifactId>
+ <version>1.1patch</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaf</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam>
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,132 +0,0 @@
-/*
- * 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.jboss.identity.federation.bindings.tomcat.sp;
-
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.JAXBElement;
-
-import org.apache.catalina.Context;
-import org.apache.catalina.connector.Request;
-import org.apache.catalina.realm.GenericPrincipal;
-import org.jboss.identity.federation.api.saml.v2.request.SAML2Request;
-import org.jboss.identity.federation.core.exceptions.ConfigurationException;
-import org.jboss.identity.federation.core.saml.v2.common.IDGenerator;
-import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
-import org.jboss.identity.federation.core.saml.v2.exceptions.AssertionExpiredException;
-import org.jboss.identity.federation.core.saml.v2.util.AssertionUtil;
-import org.jboss.identity.federation.saml.v2.assertion.AssertionType;
-import org.jboss.identity.federation.saml.v2.assertion.AttributeStatementType;
-import org.jboss.identity.federation.saml.v2.assertion.AttributeType;
-import org.jboss.identity.federation.saml.v2.assertion.NameIDType;
-import org.jboss.identity.federation.saml.v2.assertion.SubjectType;
-import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
-import org.jboss.identity.federation.saml.v2.protocol.ResponseType;
-import org.jboss.identity.federation.saml.v2.protocol.StatusType;
-
-/**
- * Common code useful for a SP
- * @author Anil.Saldhana(a)redhat.com
- * @since Jan 9, 2009
- */
-public class SPUtil
-{
- /**
- * Create a SAML2 auth request
- * @param serviceURL URL of the service
- * @param identityURL URL of the identity provider
- * @return
- * @throws ConfigurationException
- */
- public AuthnRequestType createSAMLRequest(String serviceURL, String identityURL) throws ConfigurationException
- {
- if(serviceURL == null)
- throw new IllegalArgumentException("serviceURL is null");
- if(identityURL == null)
- throw new IllegalArgumentException("identityURL is null");
-
- SAML2Request saml2Request = new SAML2Request();
- String id = IDGenerator.create("ID_");
- return saml2Request.createAuthnRequestType(id, serviceURL, identityURL, serviceURL);
- }
-
- /**
- * Handle the SAMLResponse from the IDP
- * @param request entire request from IDP
- * @param responseType ResponseType that has been generated
- * @param serverEnvironment tomcat,jboss etc
- * @return
- * @throws AssertionExpiredException
- */
- @SuppressWarnings("unchecked")
- public Principal handleSAMLResponse(Request request, ResponseType responseType)
- throws ConfigurationException, AssertionExpiredException
- {
- if(request == null)
- throw new IllegalArgumentException("request is null");
- if(responseType == null)
- throw new IllegalArgumentException("response type is null");
-
- StatusType statusType = responseType.getStatus();
- if(statusType == null)
- throw new IllegalArgumentException("Status Type from the IDP is null");
-
- String statusValue = statusType.getStatusCode().getValue();
- if(JBossSAMLURIConstants.STATUS_SUCCESS.get().equals(statusValue) == false)
- throw new SecurityException("IDP forbid the user");
-
- List<Object> assertions = responseType.getAssertionOrEncryptedAssertion();
- if(assertions.size() == 0)
- throw new IllegalStateException("No assertions in reply from IDP");
-
- AssertionType assertion = (AssertionType)assertions.get(0);
- //Check for validity of assertion
- boolean expiredAssertion = AssertionUtil.hasExpired(assertion);
- if(expiredAssertion)
- throw new AssertionExpiredException();
-
- SubjectType subject = assertion.getSubject();
- JAXBElement<NameIDType> jnameID = (JAXBElement<NameIDType>) subject.getContent().get(0);
- NameIDType nameID = jnameID.getValue();
- String userName = nameID.getValue();
- List<String> roles = new ArrayList<String>();
-
- //Let us get the roles
- AttributeStatementType attributeStatement = (AttributeStatementType) assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().get(0);
- List<Object> attList = attributeStatement.getAttributeOrEncryptedAttribute();
- for(Object obj:attList)
- {
- AttributeType attr = (AttributeType) obj;
- String roleName = (String) attr.getAttributeValue().get(0);
- roles.add(roleName);
- }
- return this.createGenericPrincipal(request, userName, roles);
- }
-
- private Principal createGenericPrincipal(Request request, String username, List<String> roles)
- {
- Context ctx = request.getContext();
- return new GenericPrincipal(ctx.getRealm(), username, null, roles);
- }
-}
\ No newline at end of file
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java (from rev 790, identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,136 @@
+/*
+ * 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.jboss.identity.federation.bindings.tomcat.sp;
+
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.realm.GenericPrincipal;
+import org.jboss.identity.federation.api.saml.v2.request.SAML2Request;
+import org.jboss.identity.federation.core.exceptions.ConfigurationException;
+import org.jboss.identity.federation.core.saml.v2.common.IDGenerator;
+import org.jboss.identity.federation.core.saml.v2.common.StatementLocal;
+import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
+import org.jboss.identity.federation.core.saml.v2.exceptions.AssertionExpiredException;
+import org.jboss.identity.federation.core.saml.v2.util.AssertionUtil;
+import org.jboss.identity.federation.saml.v2.assertion.AssertionType;
+import org.jboss.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.jboss.identity.federation.saml.v2.assertion.AttributeType;
+import org.jboss.identity.federation.saml.v2.assertion.NameIDType;
+import org.jboss.identity.federation.saml.v2.assertion.SubjectType;
+import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
+import org.jboss.identity.federation.saml.v2.protocol.ResponseType;
+import org.jboss.identity.federation.saml.v2.protocol.StatusType;
+
+/**
+ * Common code useful for a SP
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Jan 9, 2009
+ */
+public class SPUtil
+{
+ /**
+ * Create a SAML2 auth request
+ * @param serviceURL URL of the service
+ * @param identityURL URL of the identity provider
+ * @return
+ * @throws ConfigurationException
+ */
+ public AuthnRequestType createSAMLRequest(String serviceURL, String identityURL) throws ConfigurationException
+ {
+ if(serviceURL == null)
+ throw new IllegalArgumentException("serviceURL is null");
+ if(identityURL == null)
+ throw new IllegalArgumentException("identityURL is null");
+
+ SAML2Request saml2Request = new SAML2Request();
+ String id = IDGenerator.create("ID_");
+ return saml2Request.createAuthnRequestType(id, serviceURL, identityURL, serviceURL);
+ }
+
+ /**
+ * Handle the SAMLResponse from the IDP
+ * @param request entire request from IDP
+ * @param responseType ResponseType that has been generated
+ * @param serverEnvironment tomcat,jboss etc
+ * @return
+ * @throws AssertionExpiredException
+ */
+ @SuppressWarnings("unchecked")
+ public Principal handleSAMLResponse(Request request, ResponseType responseType)
+ throws ConfigurationException, AssertionExpiredException
+ {
+ if(request == null)
+ throw new IllegalArgumentException("request is null");
+ if(responseType == null)
+ throw new IllegalArgumentException("response type is null");
+
+ StatusType statusType = responseType.getStatus();
+ if(statusType == null)
+ throw new IllegalArgumentException("Status Type from the IDP is null");
+
+ String statusValue = statusType.getStatusCode().getValue();
+ if(JBossSAMLURIConstants.STATUS_SUCCESS.get().equals(statusValue) == false)
+ throw new SecurityException("IDP forbid the user");
+
+ List<Object> assertions = responseType.getAssertionOrEncryptedAssertion();
+ if(assertions.size() == 0)
+ throw new IllegalStateException("No assertions in reply from IDP");
+
+ AssertionType assertion = (AssertionType)assertions.get(0);
+ //Check for validity of assertion
+ boolean expiredAssertion = AssertionUtil.hasExpired(assertion);
+ if(expiredAssertion)
+ throw new AssertionExpiredException();
+
+ SubjectType subject = assertion.getSubject();
+ JAXBElement<NameIDType> jnameID = (JAXBElement<NameIDType>) subject.getContent().get(0);
+ NameIDType nameID = jnameID.getValue();
+ String userName = nameID.getValue();
+ List<String> roles = new ArrayList<String>();
+
+ //Set it on a thread local for JBID integrators
+ StatementLocal.statements.set(assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement());
+
+ //Let us get the roles
+ AttributeStatementType attributeStatement = (AttributeStatementType) assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().get(0);
+ List<Object> attList = attributeStatement.getAttributeOrEncryptedAttribute();
+ for(Object obj:attList)
+ {
+ AttributeType attr = (AttributeType) obj;
+ String roleName = (String) attr.getAttributeValue().get(0);
+ roles.add(roleName);
+ }
+ return this.createGenericPrincipal(request, userName, roles);
+ }
+
+ private Principal createGenericPrincipal(Request request, String username, List<String> roles)
+ {
+ Context ctx = request.getContext();
+ return new GenericPrincipal(ctx.getRealm(), username, null, roles);
+ }
+}
\ No newline at end of file
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-bindings-jboss/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-bindings-jboss/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-bindings-jboss/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,119 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-identity-bindings-jboss</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Identity Federation Server Bindings for JBoss</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity OpenSAML contains the foundation for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
- <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-model</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-bindings</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>6.0.18</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
- <version>2.0.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx</artifactId>
- <version>2.0.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doclet>org.jboss.apiviz.APIviz</doclet>
- <docletArtifact>
- <groupId>org.jboss.apiviz</groupId>
- <artifactId>apiviz</artifactId>
- <version>1.2.5.GA</version>
- </docletArtifact>
- <additionalparam>
- -charset UTF-8
- -docencoding UTF-8
- -version
- -author
- -breakiterator
- -windowtitle "${project.name} ${project.version} API Reference"
- -doctitle "${project.name} ${project.version} API Reference"
- -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
- -link http://java.sun.com/javase/6/docs/api/
- -sourceclasspath ${project.build.outputDirectory}
- </additionalparam>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-bindings-jboss/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-bindings-jboss/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-bindings-jboss/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-bindings-jboss/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,119 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-parent</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-identity-bindings-jboss</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Identity Federation Server Bindings for JBoss</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity OpenSAML contains the foundation for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-bindings</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>6.0.18</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ <version>2.0.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ <version>2.0.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam>
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-fed-api/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-fed-api/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-fed-api/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,161 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-identity-fed-api</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Identity Federation Consolidated API</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Federation API contains the API to be used by the users of JBoss Identity Federation.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
- <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-model</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>sun-jaxws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.openid4java</groupId>
- <artifactId>openid4java</artifactId>
- </dependency>
- <dependency>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache</groupId>
- <artifactId>xmlsec</artifactId>
- </dependency>
- <dependency>
- <groupId>sun-jaf</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>codehaus-stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- <version>3.1.2.SP3</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.2.14.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>2.0.1.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doclet>org.jboss.apiviz.APIviz</doclet>
- <docletArtifact>
- <groupId>org.jboss.apiviz</groupId>
- <artifactId>apiviz</artifactId>
- <version>1.2.5.GA</version>
- </docletArtifact>
- <additionalparam>
- -charset UTF-8
- -docencoding UTF-8
- -version
- -author
- -breakiterator
- -windowtitle "${project.name} ${project.version} API Reference"
- -doctitle "${project.name} ${project.version} API Reference"
- -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
- -link http://java.sun.com/javase/6/docs/api/
- -sourceclasspath ${project.build.outputDirectory}
- </additionalparam>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-fed-api/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-fed-api/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-fed-api/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-fed-api/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,161 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-parent</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-identity-fed-api</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Identity Federation Consolidated API</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Federation API contains the API to be used by the users of JBoss Identity Federation.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>xmlsec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaf</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>codehaus-stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-client</artifactId>
+ <version>3.1.2.SP3</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.14.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.1.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam>
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,118 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-identity-fed-core</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Identity Federation Core</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Federation Core contains the core infrastructure code</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
- <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-model</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.openid4java</groupId>
- <artifactId>openid4java</artifactId>
- </dependency>
- <dependency>
- <groupId>sun-jaxws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>sun-jaf</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>codehaus-stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doclet>org.jboss.apiviz.APIviz</doclet>
- <docletArtifact>
- <groupId>org.jboss.apiviz</groupId>
- <artifactId>apiviz</artifactId>
- <version>1.2.5.GA</version>
- </docletArtifact>
- <additionalparam>
- -charset UTF-8
- -docencoding UTF-8
- -version
- -author
- -breakiterator
- -windowtitle "${project.name} ${project.version} API Reference"
- -doctitle "${project.name} ${project.version} API Reference"
- -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
- -link http://java.sun.com/javase/6/docs/api/
- -sourceclasspath ${project.build.outputDirectory}
- </additionalparam>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-fed-core/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,118 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-parent</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-identity-fed-core</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Identity Federation Core</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Federation Core contains the core infrastructure code</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaf</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>codehaus-stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam>
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/StatementUtil.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/StatementUtil.java 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/StatementUtil.java 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,107 +0,0 @@
-/*
- * 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.jboss.identity.federation.core.saml.v2.util;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
-import org.jboss.identity.federation.core.constants.AttributeConstants;
-import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
-import org.jboss.identity.federation.core.saml.v2.constants.X500SAMLProfileConstants;
-import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLBaseFactory;
-import org.jboss.identity.federation.saml.v2.assertion.AttributeStatementType;
-import org.jboss.identity.federation.saml.v2.assertion.AttributeType;
-import org.jboss.identity.federation.saml.v2.assertion.ObjectFactory;
-import org.jboss.identity.federation.saml.v2.assertion.StatementAbstractType;
-
-/**
- * Deals with SAML2 Statements
- * @author Anil.Saldhana(a)redhat.com
- * @since Aug 31, 2009
- */
-public class StatementUtil
-{
- public static final QName X500_QNAME = new QName(JBossSAMLURIConstants.X500_NSURI.get(),
- "Encoding");
-
- private static ObjectFactory factory = new ObjectFactory();
-
- public static List<StatementAbstractType> createStatements(Map<String,Object> attributes)
- {
- AttributeStatementType attrStatement = null;
- List<StatementAbstractType> statements = new ArrayList<StatementAbstractType>();
-
- int i = 0;
-
- Set<String> keys = attributes.keySet();
- for(String key: keys)
- {
- if(i == 0)
- {
- //Deal with the X500 Profile of SAML2
- attrStatement = JBossSAMLBaseFactory.createAttributeStatement();
- i++;
- }
- AttributeType att = getX500Attribute();
-
- Object value = attributes.get(key);
-
- if(AttributeConstants.EMAIL_ADDRESS.equals(key))
- {
- att.setFriendlyName(X500SAMLProfileConstants.EMAIL_ADDRESS.getFriendlyName());
- att.setName(X500SAMLProfileConstants.EMAIL_ADDRESS.get());
- }
- else if(AttributeConstants.EMPLOYEE_NUMBER.equals(key))
- {
- att.setFriendlyName(X500SAMLProfileConstants.EMPLOYEE_NUMBER.getFriendlyName());
- att.setName(X500SAMLProfileConstants.EMPLOYEE_NUMBER.get());
- }
- else if(AttributeConstants.GIVEN_NAME.equals(key))
- {
- att.setFriendlyName(X500SAMLProfileConstants.GIVENNAME.getFriendlyName());
- att.setName(X500SAMLProfileConstants.GIVENNAME.get());
- }
- else if(AttributeConstants.TELEPHONE.equals(key))
- {
- att.setFriendlyName(X500SAMLProfileConstants.TELEPHONE.getFriendlyName());
- att.setName(X500SAMLProfileConstants.TELEPHONE.get());
- }
- att.getAttributeValue().add(value);
- attrStatement.getAttributeOrEncryptedAttribute().add(att);
- }
- statements.add(attrStatement);
- return statements;
- }
-
- private static AttributeType getX500Attribute()
- {
- AttributeType att = factory.createAttributeType();
- att.getOtherAttributes().put(X500_QNAME, "LDAP");
-
- att.setNameFormat(JBossSAMLURIConstants.ATTRIBUTE_FORMAT_URI.get());
- return att;
- }
-}
\ No newline at end of file
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/StatementUtil.java (from rev 790, identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/StatementUtil.java)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/StatementUtil.java (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/StatementUtil.java 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,107 @@
+/*
+ * 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.jboss.identity.federation.core.saml.v2.util;
+
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.identity.federation.core.constants.AttributeConstants;
+import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
+import org.jboss.identity.federation.core.saml.v2.constants.X500SAMLProfileConstants;
+import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLBaseFactory;
+import org.jboss.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.jboss.identity.federation.saml.v2.assertion.AttributeType;
+import org.jboss.identity.federation.saml.v2.assertion.ObjectFactory;
+
+/**
+ * Deals with SAML2 Statements
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Aug 31, 2009
+ */
+public class StatementUtil
+{
+ public static final QName X500_QNAME = new QName(JBossSAMLURIConstants.X500_NSURI.get(),
+ "Encoding");
+
+ private static ObjectFactory factory = new ObjectFactory();
+
+ /**
+ * Create an attribute statement with all the attributes
+ * @param attributes a map with keys from {@link AttributeConstants}
+ * @return
+ */
+ public static AttributeStatementType createAttributeStatement(Map<String,Object> attributes)
+ {
+ AttributeStatementType attrStatement = null;
+
+ int i = 0;
+
+ Set<String> keys = attributes.keySet();
+ for(String key: keys)
+ {
+ if(i == 0)
+ {
+ //Deal with the X500 Profile of SAML2
+ attrStatement = JBossSAMLBaseFactory.createAttributeStatement();
+ i++;
+ }
+ AttributeType att = getX500Attribute();
+
+ Object value = attributes.get(key);
+
+ if(AttributeConstants.EMAIL_ADDRESS.equals(key))
+ {
+ att.setFriendlyName(X500SAMLProfileConstants.EMAIL_ADDRESS.getFriendlyName());
+ att.setName(X500SAMLProfileConstants.EMAIL_ADDRESS.get());
+ }
+ else if(AttributeConstants.EMPLOYEE_NUMBER.equals(key))
+ {
+ att.setFriendlyName(X500SAMLProfileConstants.EMPLOYEE_NUMBER.getFriendlyName());
+ att.setName(X500SAMLProfileConstants.EMPLOYEE_NUMBER.get());
+ }
+ else if(AttributeConstants.GIVEN_NAME.equals(key))
+ {
+ att.setFriendlyName(X500SAMLProfileConstants.GIVENNAME.getFriendlyName());
+ att.setName(X500SAMLProfileConstants.GIVENNAME.get());
+ }
+ else if(AttributeConstants.TELEPHONE.equals(key))
+ {
+ att.setFriendlyName(X500SAMLProfileConstants.TELEPHONE.getFriendlyName());
+ att.setName(X500SAMLProfileConstants.TELEPHONE.get());
+ }
+ att.getAttributeValue().add(value);
+ attrStatement.getAttributeOrEncryptedAttribute().add(att);
+ }
+ return attrStatement;
+ }
+
+ private static AttributeType getX500Attribute()
+ {
+ AttributeType att = factory.createAttributeType();
+ att.getOtherAttributes().put(X500_QNAME, "LDAP");
+
+ att.setNameFormat(JBossSAMLURIConstants.ATTRIBUTE_FORMAT_URI.get());
+ return att;
+ }
+}
\ No newline at end of file
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/saml/v2/X500AttributeUnitTestCase.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/saml/v2/X500AttributeUnitTestCase.java 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/saml/v2/X500AttributeUnitTestCase.java 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,108 +0,0 @@
-/*
- * 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.jboss.test.identity.federation.core.saml.v2;
-
-import java.io.ByteArrayOutputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Marshaller;
-
-import org.jboss.identity.federation.core.constants.AttributeConstants;
-import org.jboss.identity.federation.core.saml.v2.common.IDGenerator;
-import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
-import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLAuthnResponseFactory;
-import org.jboss.identity.federation.core.saml.v2.factories.SAMLProtocolFactory;
-import org.jboss.identity.federation.core.saml.v2.holders.IDPInfoHolder;
-import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
-import org.jboss.identity.federation.core.saml.v2.holders.SPInfoHolder;
-import org.jboss.identity.federation.core.saml.v2.util.DocumentUtil;
-import org.jboss.identity.federation.core.saml.v2.util.StatementUtil;
-import org.jboss.identity.federation.saml.v2.assertion.AssertionType;
-import org.jboss.identity.federation.saml.v2.assertion.StatementAbstractType;
-import org.jboss.identity.federation.saml.v2.protocol.ResponseType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import junit.framework.TestCase;
-
-/**
- * Unit test the X500 Profile of SAML2
- * @author Anil.Saldhana(a)redhat.com
- * @since Sep 14, 2009
- */
-public class X500AttributeUnitTestCase extends TestCase
-{
- public void testX500Marshalling() throws Exception
- {
- Map<String,Object> attributes = new HashMap<String, Object>();
- attributes.put(AttributeConstants.EMAIL_ADDRESS, "test@a");
- attributes.put(AttributeConstants.GIVEN_NAME, "anil");
-
- List<StatementAbstractType>
- statementList = StatementUtil.createStatements(attributes);
-
- IssuerInfoHolder issuerHolder = new IssuerInfoHolder("http://idp");
- issuerHolder.setStatusCode(JBossSAMLURIConstants.STATUS_SUCCESS.get());
-
- IDPInfoHolder idp = new IDPInfoHolder();
- idp.setNameIDFormatValue(IDGenerator.create());
-
- ResponseType rt = JBossSAMLAuthnResponseFactory.createResponseType("response111",
- new SPInfoHolder(), idp, issuerHolder);
- assertNotNull(rt);
-
- AssertionType assertion = (AssertionType) rt.getAssertionOrEncryptedAssertion().get(0);
- assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().addAll(statementList);
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
- Marshaller marshaller = JBossSAMLAuthnResponseFactory.getValidatingMarshaller(false);
- JAXBElement<ResponseType> jaxb = SAMLProtocolFactory.getObjectFactory().createResponse(rt);
- marshaller.marshal(jaxb, baos);
- //marshaller.marshal(jaxb, System.out);
-
- Document samlDom = DocumentUtil.getDocument(new String(baos.toByteArray()));
- NodeList nl = samlDom.getElementsByTagName("Attribute");
- assertEquals("nodes = 2", 2, nl.getLength());
-
- String x500NS = JBossSAMLURIConstants.X500_NSURI.get();
- String encodingLocalName = "Encoding";
-
- Element attrib = (Element) nl.item(0);
- assertTrue("Has ldap encoding?", attrib.hasAttributeNS( x500NS, encodingLocalName));
- assertEquals("LDAP",
- attrib.getAttributeNodeNS(x500NS, encodingLocalName).getNodeValue());
-
- NodeList nla =
- attrib.getElementsByTagNameNS(JBossSAMLURIConstants.ASSERTION_NSURI.get(),
- "AttributeValue");
-
- Node attribNode = nla.item(0);
- String nodeValue = attribNode.getTextContent();
- assertTrue(nodeValue.equals("test@a") || nodeValue.equals("anil"));
- }
-}
\ No newline at end of file
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/saml/v2/X500AttributeUnitTestCase.java (from rev 790, identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/saml/v2/X500AttributeUnitTestCase.java)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/saml/v2/X500AttributeUnitTestCase.java (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/saml/v2/X500AttributeUnitTestCase.java 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.identity.federation.core.saml.v2;
+
+import java.io.ByteArrayOutputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.Marshaller;
+
+import junit.framework.TestCase;
+
+import org.jboss.identity.federation.core.constants.AttributeConstants;
+import org.jboss.identity.federation.core.saml.v2.common.IDGenerator;
+import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
+import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLAuthnResponseFactory;
+import org.jboss.identity.federation.core.saml.v2.factories.SAMLProtocolFactory;
+import org.jboss.identity.federation.core.saml.v2.holders.IDPInfoHolder;
+import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
+import org.jboss.identity.federation.core.saml.v2.holders.SPInfoHolder;
+import org.jboss.identity.federation.core.saml.v2.util.DocumentUtil;
+import org.jboss.identity.federation.core.saml.v2.util.StatementUtil;
+import org.jboss.identity.federation.saml.v2.assertion.AssertionType;
+import org.jboss.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.jboss.identity.federation.saml.v2.protocol.ResponseType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * Unit test the X500 Profile of SAML2
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Sep 14, 2009
+ */
+public class X500AttributeUnitTestCase extends TestCase
+{
+ public void testX500Marshalling() throws Exception
+ {
+ Map<String,Object> attributes = new HashMap<String, Object>();
+ attributes.put(AttributeConstants.EMAIL_ADDRESS, "test@a");
+ attributes.put(AttributeConstants.GIVEN_NAME, "anil");
+
+ AttributeStatementType attrStat = StatementUtil.createAttributeStatement(attributes);
+
+ IssuerInfoHolder issuerHolder = new IssuerInfoHolder("http://idp");
+ issuerHolder.setStatusCode(JBossSAMLURIConstants.STATUS_SUCCESS.get());
+
+ IDPInfoHolder idp = new IDPInfoHolder();
+ idp.setNameIDFormatValue(IDGenerator.create());
+
+ ResponseType rt = JBossSAMLAuthnResponseFactory.createResponseType("response111",
+ new SPInfoHolder(), idp, issuerHolder);
+ assertNotNull(rt);
+
+ AssertionType assertion = (AssertionType) rt.getAssertionOrEncryptedAssertion().get(0);
+ assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().add(attrStat);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ Marshaller marshaller = JBossSAMLAuthnResponseFactory.getValidatingMarshaller(false);
+ JAXBElement<ResponseType> jaxb = SAMLProtocolFactory.getObjectFactory().createResponse(rt);
+ marshaller.marshal(jaxb, baos);
+ //marshaller.marshal(jaxb, System.out);
+
+ Document samlDom = DocumentUtil.getDocument(new String(baos.toByteArray()));
+ NodeList nl = samlDom.getElementsByTagName("Attribute");
+ assertEquals("nodes = 2", 2, nl.getLength());
+
+ String x500NS = JBossSAMLURIConstants.X500_NSURI.get();
+ String encodingLocalName = "Encoding";
+
+ Element attrib = (Element) nl.item(0);
+ assertTrue("Has ldap encoding?", attrib.hasAttributeNS( x500NS, encodingLocalName));
+ assertEquals("LDAP",
+ attrib.getAttributeNodeNS(x500NS, encodingLocalName).getNodeValue());
+
+ NodeList nla =
+ attrib.getElementsByTagNameNS(JBossSAMLURIConstants.ASSERTION_NSURI.get(),
+ "AttributeValue");
+
+ Node attribNode = nla.item(0);
+ String nodeValue = attribNode.getTextContent();
+ assertTrue(nodeValue.equals("test@a") || nodeValue.equals("anil"));
+ }
+}
\ No newline at end of file
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-fed-model/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-fed-model/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-fed-model/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,130 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-identity-fed-model</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Identity Federation Model</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Federation Model contains the JAXB2 model.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
- <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-xmlsec-model</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>apache-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </dependency>
- <dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbossxacml</artifactId>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>sun-jaf</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>codehaus-stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>apache-xalan</groupId>
- <artifactId>serializer</artifactId>
- <version>2.7.0.patch01-brew</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doclet>org.jboss.apiviz.APIviz</doclet>
- <docletArtifact>
- <groupId>org.jboss.apiviz</groupId>
- <artifactId>apiviz</artifactId>
- <version>1.2.5.GA</version>
- </docletArtifact>
- <additionalparam>
- -charset UTF-8
- -docencoding UTF-8
- -version
- -author
- -breakiterator
- -windowtitle "${project.name} ${project.version} API Reference"
- -doctitle "${project.name} ${project.version} API Reference"
- -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
- -link http://java.sun.com/javase/6/docs/api/
- -sourceclasspath ${project.build.outputDirectory}
- </additionalparam>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-fed-model/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-fed-model/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-fed-model/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-fed-model/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,130 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-parent</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-identity-fed-model</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Identity Federation Model</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Federation Model contains the JAXB2 model.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-xmlsec-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>apache-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbossxacml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaf</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>codehaus-stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-xalan</groupId>
+ <artifactId>serializer</artifactId>
+ <version>2.7.0.patch01-brew</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam>
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-seam/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-seam/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-seam/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,129 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-parent
- </artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-identity-seam</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Identity Federation Bindings for Seam</name>
- <url>http://labs.jboss.org/portal/jbossidentity/
- </url>
- <description>JBoss Identity Seam bindings contain the default
- bindings needed for Seam web applications.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt
- </url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- <argLine>
- -Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed
- </argLine>
- <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-model
- </artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-web</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <version>2.1.2.GA</version>
- <type>ejb</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>sun-jaf</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>sun-jaf</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doclet>org.jboss.apiviz.APIviz</doclet>
- <docletArtifact>
- <groupId>org.jboss.apiviz</groupId>
- <artifactId>apiviz</artifactId>
- <version>1.2.5.GA</version>
- </docletArtifact>
- <additionalparam> -charset UTF-8 -docencoding UTF-8 -version
- -author -breakiterator -windowtitle "${project.name}
- ${project.version} API Reference" -doctitle "${project.name}
- ${project.version} API Reference" -bottom "Copyright ©
- ${project.inceptionYear}-Present ${project.organization.name}. All
- Rights Reserved." -link http://java.sun.com/javase/6/docs/api/
- -sourceclasspath ${project.build.outputDirectory}
- </additionalparam>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-seam/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-seam/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-seam/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-seam/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,129 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-parent
+ </artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-identity-seam</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Identity Federation Bindings for Seam</name>
+ <url>http://labs.jboss.org/portal/jbossidentity/
+ </url>
+ <description>JBoss Identity Seam bindings contain the default
+ bindings needed for Seam web applications.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt
+ </url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>
+ -Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed
+ </argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-model
+ </artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-web</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>2.1.2.GA</version>
+ <type>ejb</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaf</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaf</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam> -charset UTF-8 -docencoding UTF-8 -version
+ -author -breakiterator -windowtitle "${project.name}
+ ${project.version} API Reference" -doctitle "${project.name}
+ ${project.version} API Reference" -bottom "Copyright ©
+ ${project.inceptionYear}-Present ${project.organization.name}. All
+ Rights Reserved." -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-web/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-web/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-web/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,201 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-identity-web</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Identity Federation Web</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Web contains code that will run in any web container.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <!-- Profile to exclude the integration tests that take long time -->
- <profiles>
- <profile>
- <id>exclude-long-tests</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>false</testFailureIgnore>
- <excludes>
- <exclude>**/integration/*TestCase.java</exclude>
- </excludes>
- <forkMode>pertest</forkMode>
- <argLine>${surefire.jvm.args}</argLine>
- . <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>long-tests</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <childDelegation>true</childDelegation>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/integration/*TestCase.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- <argLine>${surefire.jvm.args}</argLine>
- . <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
- <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-model</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache</groupId>
- <artifactId>httpclient</artifactId>
- <version>3.0.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>apache-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.0.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>sun-jaf</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doclet>org.jboss.apiviz.APIviz</doclet>
- <docletArtifact>
- <groupId>org.jboss.apiviz</groupId>
- <artifactId>apiviz</artifactId>
- <version>1.2.5.GA</version>
- </docletArtifact>
- <additionalparam>
- -charset UTF-8
- -docencoding UTF-8
- -version
- -author
- -breakiterator
- -windowtitle "${project.name} ${project.version} API Reference"
- -doctitle "${project.name} ${project.version} API Reference"
- -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
- -link http://java.sun.com/javase/6/docs/api/
- -sourceclasspath ${project.build.outputDirectory}
- </additionalparam>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-web/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-web/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-web/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-web/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,201 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-parent</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-identity-web</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Identity Federation Web</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Web contains code that will run in any web container.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+
+ <!-- Profile to exclude the integration tests that take long time -->
+ <profiles>
+ <profile>
+ <id>exclude-long-tests</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <testFailureIgnore>false</testFailureIgnore>
+ <excludes>
+ <exclude>**/integration/*TestCase.java</exclude>
+ </excludes>
+ <forkMode>pertest</forkMode>
+ <argLine>${surefire.jvm.args}</argLine>
+ . <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>long-tests</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <childDelegation>true</childDelegation>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/integration/*TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>${surefire.jvm.args}</argLine>
+ . <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>3.0.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaf</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam>
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,470 +0,0 @@
-/*
- * 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.jboss.identity.federation.web.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.net.URL;
-import java.security.GeneralSecurityException;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.bind.JAXBException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-
-import org.apache.log4j.Logger;
-import org.jboss.identity.federation.api.saml.v2.request.SAML2Request;
-import org.jboss.identity.federation.api.saml.v2.response.SAML2Response;
-import org.jboss.identity.federation.api.saml.v2.sig.SAML2Signature;
-import org.jboss.identity.federation.core.config.IDPType;
-import org.jboss.identity.federation.core.config.TrustType;
-import org.jboss.identity.federation.core.exceptions.ConfigurationException;
-import org.jboss.identity.federation.core.exceptions.ParsingException;
-import org.jboss.identity.federation.core.interfaces.AttributeManager;
-import org.jboss.identity.federation.core.saml.v2.common.IDGenerator;
-import org.jboss.identity.federation.core.saml.v2.common.StatementLocal;
-import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
-import org.jboss.identity.federation.core.saml.v2.exceptions.IssueInstantMissingException;
-import org.jboss.identity.federation.core.saml.v2.exceptions.IssuerNotTrustedException;
-import org.jboss.identity.federation.core.saml.v2.holders.DestinationInfoHolder;
-import org.jboss.identity.federation.core.saml.v2.holders.IDPInfoHolder;
-import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
-import org.jboss.identity.federation.core.saml.v2.holders.SPInfoHolder;
-import org.jboss.identity.federation.core.saml.v2.util.DocumentUtil;
-import org.jboss.identity.federation.core.saml.v2.util.StatementUtil;
-import org.jboss.identity.federation.saml.v2.assertion.AssertionType;
-import org.jboss.identity.federation.saml.v2.assertion.AttributeStatementType;
-import org.jboss.identity.federation.saml.v2.assertion.StatementAbstractType;
-import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType;
-import org.jboss.identity.federation.saml.v2.protocol.ResponseType;
-import org.jboss.identity.federation.web.interfaces.TrustKeyManager;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-/**
- * Request Util
- * <b> Not thread safe</b>
- * @author Anil.Saldhana(a)redhat.com
- * @since May 18, 2009
- */
-public class IDPWebRequestUtil
-{
- private static Logger log = Logger.getLogger(IDPWebRequestUtil.class);
- private boolean trace = log.isTraceEnabled();
-
- private boolean redirectProfile = false;
- private boolean postProfile = false;
-
- private IDPType idpConfiguration;
- private TrustKeyManager keyManager;
- private AttributeManager attributeManager;
- private List<String> attribKeys;
-
- public IDPWebRequestUtil(HttpServletRequest request, IDPType idp, TrustKeyManager keym)
- {
- this.idpConfiguration = idp;
- this.keyManager = keym;
- this.redirectProfile = "GET".equals(request.getMethod());
- this.postProfile = "POST".equals(request.getMethod());
- }
-
- public void setAttributeKeys(List<String> attribKeys)
- {
- this.attribKeys = attribKeys;
- }
-
- public void setAttributeManager(AttributeManager attributeManager)
- {
- this.attributeManager = attributeManager;
- }
-
- public boolean hasSAMLRequestInRedirectProfile()
- {
- return redirectProfile;
- }
-
- public boolean hasSAMLRequestInPostProfile()
- {
- return postProfile;
- }
-
- public RequestAbstractType getSAMLRequest(String samlMessage)
- throws ParsingException, IOException
- {
- InputStream is = null;
- SAML2Request saml2Request = new SAML2Request();
- if(redirectProfile)
- {
- is = RedirectBindingUtil.base64DeflateDecode(samlMessage);
- }
- else
- {
- byte[] samlBytes = PostBindingUtil.base64Decode(samlMessage);
- if(trace) log.trace("SAMLRequest=" + new String(samlBytes));
- is = new ByteArrayInputStream(samlBytes);
- }
- return saml2Request.getRequestType(is);
- }
-
-
- public Document getResponse( String assertionConsumerURL,
- Principal userPrincipal,
- List<String> roles,
- String identityURL,
- long assertionValidity,
- boolean supportSignature)
- throws ConfigurationException, IssueInstantMissingException
- {
- Document samlResponseDocument = null;
-
- if(trace)
- log.trace("AssertionConsumerURL=" + assertionConsumerURL +
- "::assertion validity=" + assertionValidity);
- ResponseType responseType = null;
-
- SAML2Response saml2Response = new SAML2Response();
-
- //Create a response type
- String id = IDGenerator.create("ID_");
-
- IssuerInfoHolder issuerHolder = new IssuerInfoHolder(identityURL);
- issuerHolder.setStatusCode(JBossSAMLURIConstants.STATUS_SUCCESS.get());
-
- IDPInfoHolder idp = new IDPInfoHolder();
- idp.setNameIDFormatValue(userPrincipal.getName());
- idp.setNameIDFormat(JBossSAMLURIConstants.NAMEID_FORMAT_PERSISTENT.get());
-
- SPInfoHolder sp = new SPInfoHolder();
- sp.setResponseDestinationURI(assertionConsumerURL);
- responseType = saml2Response.createResponseType(id, sp, idp, issuerHolder);
-
- //Add information on the roles
- AssertionType assertion = (AssertionType) responseType.getAssertionOrEncryptedAssertion().get(0);
-
- AttributeStatementType attrStatement = saml2Response.createAttributeStatement(roles);
- assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().add(attrStatement);
-
- //Add timed conditions
- saml2Response.createTimedConditions(assertion, assertionValidity);
-
- //Add in the attributes information
- if(this.attributeManager != null)
- {
- try
- {
- Map<String, Object> attribs =
- attributeManager.getAttributes(userPrincipal, this.attribKeys);
- List<StatementAbstractType> stats = StatementUtil.createStatements(attribs);
- assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().addAll(stats);
-
- //Set it on a thread local for JBID integrators
- StatementLocal.statements.set(stats);
- }
- catch(Exception e)
- {
- log.error("Exception in generating attributes:",e);
- }
- }
-
- //Lets see how the response looks like
- if(log.isTraceEnabled())
- {
- StringWriter sw = new StringWriter();
- try
- {
- saml2Response.marshall(responseType, sw);
- }
- catch (JAXBException e)
- {
- log.trace(e);
- }
- catch (SAXException e)
- {
- log.trace(e);
- }
- log.trace("Response="+sw.toString());
- }
-
- if(trace)
- log.trace("Support Sig=" + supportSignature + " ::Post Profile?=" + hasSAMLRequestInPostProfile());
- if(supportSignature && hasSAMLRequestInPostProfile())
- {
- try
- {
- SAML2Signature saml2Signature = new SAML2Signature();
- samlResponseDocument = saml2Signature.sign(responseType, keyManager.getSigningKeyPair());
- }
- catch (Exception e)
- {
- if(trace) log.trace(e);
- }
- }
- else
- try
- {
- samlResponseDocument = saml2Response.convert(responseType);
- }
- catch (Exception e)
- {
- log.trace(e);
- }
-
- return samlResponseDocument;
- }
-
-
-
- /**
- * Verify that the issuer is trusted
- * @param issuer
- * @throws IssuerNotTrustedException
- */
- public void isTrusted(String issuer) throws IssuerNotTrustedException
- {
- if(idpConfiguration == null)
- throw new IllegalStateException("IDP Configuration is null");
- try
- {
- String issuerDomain = getDomain(issuer);
- TrustType idpTrust = idpConfiguration.getTrust();
- if(idpTrust != null)
- {
- String domainsTrusted = idpTrust.getDomains();
- if(trace)
- log.trace("Domains that IDP trusts="+domainsTrusted + " and issuer domain="+issuerDomain);
- if(domainsTrusted.indexOf(issuerDomain) < 0)
- {
- //Let us do string parts checking
- StringTokenizer st = new StringTokenizer(domainsTrusted, ",");
- while(st != null && st.hasMoreTokens())
- {
- String uriBit = st.nextToken();
- if(trace)
- log.trace("Matching uri bit="+ uriBit);
- if(issuerDomain.indexOf(uriBit) > 0)
- {
- if(trace)
- log.trace("Matched " + uriBit + " trust for " + issuerDomain );
- return;
- }
- }
- throw new IssuerNotTrustedException(issuer);
- }
- }
- }
- catch (Exception e)
- {
- throw new IssuerNotTrustedException(e.getLocalizedMessage(),e);
- }
- }
-
- /**
- * Send a response
- * @param responseDoc
- * @param relayState
- * @param response
- * @throws IOException
- * @throws GeneralSecurityException
- */
- public void send(Document responseDoc, String destination,
- String relayState,
- HttpServletResponse response,
- boolean supportSignature,
- PrivateKey signingKey) throws IOException, GeneralSecurityException
- {
- if(responseDoc == null)
- throw new IllegalArgumentException("responseType is null");
-
- byte[] responseBytes = null;
- try
- {
- responseBytes = DocumentUtil.getDocumentAsString(responseDoc).getBytes("UTF-8");
- }
- catch (TransformerFactoryConfigurationError e)
- {
- if(trace) log.trace(e);
- }
- catch (TransformerException e)
- {
- if(trace) log.trace(e);
- }
-
- if(redirectProfile)
- {
- String urlEncodedResponse = RedirectBindingUtil.deflateBase64URLEncode(responseBytes);
-
- if(trace) log.trace("IDP:Destination=" + destination);
-
- if(relayState != null && relayState.length() > 0)
- relayState = RedirectBindingUtil.urlEncode(relayState);
-
- String finalDest = destination + getDestination(urlEncodedResponse, relayState,
- supportSignature);
- if(trace) log.trace("Redirecting to="+ finalDest);
- HTTPRedirectUtil.sendRedirectForResponder(finalDest, response);
- }
- else
- {
- String samlResponse = PostBindingUtil.base64Encode(new String(responseBytes));
-
- PostBindingUtil.sendPost(new DestinationInfoHolder(destination,
- samlResponse, relayState), response, false);
- }
- }
-
- /**
- * Generate a Destination URL for the HTTPRedirect binding
- * with the saml response and relay state
- * @param urlEncodedResponse
- * @param urlEncodedRelayState
- * @return
- */
- public String getDestination(String urlEncodedResponse, String urlEncodedRelayState,
- boolean supportSignature)
- {
- StringBuilder sb = new StringBuilder();
-
- if (supportSignature)
- {
- try
- {
- sb.append(RedirectBindingSignatureUtil.getSAMLResponseURLWithSignature(urlEncodedResponse,
- urlEncodedRelayState, keyManager.getSigningKey()));
- }
- catch (Exception e)
- {
- if(trace) log.trace(e);
- }
- }
- else
- {
- sb.append("?SAMLResponse=").append(urlEncodedResponse);
- if (urlEncodedRelayState != null && urlEncodedRelayState.length() > 0)
- sb.append("&RelayState=").append(urlEncodedRelayState);
- }
- return sb.toString();
- }
-
- /**
- * Create an Error Response
- * @param responseURL
- * @param status
- * @param identityURL
- * @param supportSignature
- * @return
- * @throws ConfigurationException
- */
- public Document getErrorResponse(String responseURL, String status,
- String identityURL, boolean supportSignature)
- {
- Document samlResponse = null;
- ResponseType responseType = null;
-
- SAML2Response saml2Response = new SAML2Response();
-
- //Create a response type
- String id = IDGenerator.create("ID_");
-
- IssuerInfoHolder issuerHolder = new IssuerInfoHolder(identityURL);
- issuerHolder.setStatusCode(status);
-
- IDPInfoHolder idp = new IDPInfoHolder();
- idp.setNameIDFormatValue(null);
- idp.setNameIDFormat(JBossSAMLURIConstants.NAMEID_FORMAT_PERSISTENT.get());
-
- SPInfoHolder sp = new SPInfoHolder();
- sp.setResponseDestinationURI(responseURL);
- try
- {
- responseType = saml2Response.createResponseType(id, sp, idp, issuerHolder);
- }
- catch (ConfigurationException e1)
- {
- if(trace) log.trace(e1);
- responseType = saml2Response.createResponseType();
- }
-
- //Lets see how the response looks like
- if(log.isTraceEnabled())
- {
- log.trace("Error_ResponseType = ");
- StringWriter sw = new StringWriter();
- try
- {
- saml2Response.marshall(responseType, sw);
- }
- catch (JAXBException e)
- {
- log.trace(e);
- }
- catch (SAXException e)
- {
- log.trace(e);
- }
- log.trace("Response="+sw.toString());
- }
-
- if(supportSignature)
- {
- try
- {
- SAML2Signature ss = new SAML2Signature();
- samlResponse = ss.sign(responseType, keyManager.getSigningKeyPair());
- }
- catch (Exception e)
- {
- if(trace) log.trace(e);
- }
- }
- else
- try
- {
- samlResponse = saml2Response.convert(responseType);
- }
- catch (Exception e)
- {
- if(trace) log.trace(e);
- }
-
- return samlResponse;
- }
-
- /**
- * Given a SP or IDP issuer from the assertion, return the host
- * @param domainURL
- * @return
- * @throws IOException
- */
- private static String getDomain(String domainURL) throws IOException
- {
- URL url = new URL(domainURL);
- return url.getHost();
- }
-}
\ No newline at end of file
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java (from rev 790, identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,465 @@
+/*
+ * 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.jboss.identity.federation.web.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.net.URL;
+import java.security.GeneralSecurityException;
+import java.security.Principal;
+import java.security.PrivateKey;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.bind.JAXBException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+
+import org.apache.log4j.Logger;
+import org.jboss.identity.federation.api.saml.v2.request.SAML2Request;
+import org.jboss.identity.federation.api.saml.v2.response.SAML2Response;
+import org.jboss.identity.federation.api.saml.v2.sig.SAML2Signature;
+import org.jboss.identity.federation.core.config.IDPType;
+import org.jboss.identity.federation.core.config.TrustType;
+import org.jboss.identity.federation.core.exceptions.ConfigurationException;
+import org.jboss.identity.federation.core.exceptions.ParsingException;
+import org.jboss.identity.federation.core.interfaces.AttributeManager;
+import org.jboss.identity.federation.core.saml.v2.common.IDGenerator;
+import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
+import org.jboss.identity.federation.core.saml.v2.exceptions.IssueInstantMissingException;
+import org.jboss.identity.federation.core.saml.v2.exceptions.IssuerNotTrustedException;
+import org.jboss.identity.federation.core.saml.v2.holders.DestinationInfoHolder;
+import org.jboss.identity.federation.core.saml.v2.holders.IDPInfoHolder;
+import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
+import org.jboss.identity.federation.core.saml.v2.holders.SPInfoHolder;
+import org.jboss.identity.federation.core.saml.v2.util.DocumentUtil;
+import org.jboss.identity.federation.core.saml.v2.util.StatementUtil;
+import org.jboss.identity.federation.saml.v2.assertion.AssertionType;
+import org.jboss.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType;
+import org.jboss.identity.federation.saml.v2.protocol.ResponseType;
+import org.jboss.identity.federation.web.interfaces.TrustKeyManager;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+/**
+ * Request Util
+ * <b> Not thread safe</b>
+ * @author Anil.Saldhana(a)redhat.com
+ * @since May 18, 2009
+ */
+public class IDPWebRequestUtil
+{
+ private static Logger log = Logger.getLogger(IDPWebRequestUtil.class);
+ private boolean trace = log.isTraceEnabled();
+
+ private boolean redirectProfile = false;
+ private boolean postProfile = false;
+
+ private IDPType idpConfiguration;
+ private TrustKeyManager keyManager;
+ private AttributeManager attributeManager;
+ private List<String> attribKeys;
+
+ public IDPWebRequestUtil(HttpServletRequest request, IDPType idp, TrustKeyManager keym)
+ {
+ this.idpConfiguration = idp;
+ this.keyManager = keym;
+ this.redirectProfile = "GET".equals(request.getMethod());
+ this.postProfile = "POST".equals(request.getMethod());
+ }
+
+ public void setAttributeKeys(List<String> attribKeys)
+ {
+ this.attribKeys = attribKeys;
+ }
+
+ public void setAttributeManager(AttributeManager attributeManager)
+ {
+ this.attributeManager = attributeManager;
+ }
+
+ public boolean hasSAMLRequestInRedirectProfile()
+ {
+ return redirectProfile;
+ }
+
+ public boolean hasSAMLRequestInPostProfile()
+ {
+ return postProfile;
+ }
+
+ public RequestAbstractType getSAMLRequest(String samlMessage)
+ throws ParsingException, IOException
+ {
+ InputStream is = null;
+ SAML2Request saml2Request = new SAML2Request();
+ if(redirectProfile)
+ {
+ is = RedirectBindingUtil.base64DeflateDecode(samlMessage);
+ }
+ else
+ {
+ byte[] samlBytes = PostBindingUtil.base64Decode(samlMessage);
+ if(trace) log.trace("SAMLRequest=" + new String(samlBytes));
+ is = new ByteArrayInputStream(samlBytes);
+ }
+ return saml2Request.getRequestType(is);
+ }
+
+
+ public Document getResponse( String assertionConsumerURL,
+ Principal userPrincipal,
+ List<String> roles,
+ String identityURL,
+ long assertionValidity,
+ boolean supportSignature)
+ throws ConfigurationException, IssueInstantMissingException
+ {
+ Document samlResponseDocument = null;
+
+ if(trace)
+ log.trace("AssertionConsumerURL=" + assertionConsumerURL +
+ "::assertion validity=" + assertionValidity);
+ ResponseType responseType = null;
+
+ SAML2Response saml2Response = new SAML2Response();
+
+ //Create a response type
+ String id = IDGenerator.create("ID_");
+
+ IssuerInfoHolder issuerHolder = new IssuerInfoHolder(identityURL);
+ issuerHolder.setStatusCode(JBossSAMLURIConstants.STATUS_SUCCESS.get());
+
+ IDPInfoHolder idp = new IDPInfoHolder();
+ idp.setNameIDFormatValue(userPrincipal.getName());
+ idp.setNameIDFormat(JBossSAMLURIConstants.NAMEID_FORMAT_PERSISTENT.get());
+
+ SPInfoHolder sp = new SPInfoHolder();
+ sp.setResponseDestinationURI(assertionConsumerURL);
+ responseType = saml2Response.createResponseType(id, sp, idp, issuerHolder);
+
+ //Add information on the roles
+ AssertionType assertion = (AssertionType) responseType.getAssertionOrEncryptedAssertion().get(0);
+
+ AttributeStatementType attrStatement = saml2Response.createAttributeStatement(roles);
+ assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().add(attrStatement);
+
+ //Add timed conditions
+ saml2Response.createTimedConditions(assertion, assertionValidity);
+
+ //Add in the attributes information
+ if(this.attributeManager != null)
+ {
+ try
+ {
+ Map<String, Object> attribs =
+ attributeManager.getAttributes(userPrincipal, this.attribKeys);
+ AttributeStatementType attStatement = StatementUtil.createAttributeStatement(attribs);
+ assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().add(attStatement);
+ }
+ catch(Exception e)
+ {
+ log.error("Exception in generating attributes:",e);
+ }
+ }
+
+ //Lets see how the response looks like
+ if(log.isTraceEnabled())
+ {
+ StringWriter sw = new StringWriter();
+ try
+ {
+ saml2Response.marshall(responseType, sw);
+ }
+ catch (JAXBException e)
+ {
+ log.trace(e);
+ }
+ catch (SAXException e)
+ {
+ log.trace(e);
+ }
+ log.trace("Response="+sw.toString());
+ }
+
+ if(trace)
+ log.trace("Support Sig=" + supportSignature + " ::Post Profile?=" + hasSAMLRequestInPostProfile());
+ if(supportSignature && hasSAMLRequestInPostProfile())
+ {
+ try
+ {
+ SAML2Signature saml2Signature = new SAML2Signature();
+ samlResponseDocument = saml2Signature.sign(responseType, keyManager.getSigningKeyPair());
+ }
+ catch (Exception e)
+ {
+ if(trace) log.trace(e);
+ }
+ }
+ else
+ try
+ {
+ samlResponseDocument = saml2Response.convert(responseType);
+ }
+ catch (Exception e)
+ {
+ log.trace(e);
+ }
+
+ return samlResponseDocument;
+ }
+
+
+
+ /**
+ * Verify that the issuer is trusted
+ * @param issuer
+ * @throws IssuerNotTrustedException
+ */
+ public void isTrusted(String issuer) throws IssuerNotTrustedException
+ {
+ if(idpConfiguration == null)
+ throw new IllegalStateException("IDP Configuration is null");
+ try
+ {
+ String issuerDomain = getDomain(issuer);
+ TrustType idpTrust = idpConfiguration.getTrust();
+ if(idpTrust != null)
+ {
+ String domainsTrusted = idpTrust.getDomains();
+ if(trace)
+ log.trace("Domains that IDP trusts="+domainsTrusted + " and issuer domain="+issuerDomain);
+ if(domainsTrusted.indexOf(issuerDomain) < 0)
+ {
+ //Let us do string parts checking
+ StringTokenizer st = new StringTokenizer(domainsTrusted, ",");
+ while(st != null && st.hasMoreTokens())
+ {
+ String uriBit = st.nextToken();
+ if(trace)
+ log.trace("Matching uri bit="+ uriBit);
+ if(issuerDomain.indexOf(uriBit) > 0)
+ {
+ if(trace)
+ log.trace("Matched " + uriBit + " trust for " + issuerDomain );
+ return;
+ }
+ }
+ throw new IssuerNotTrustedException(issuer);
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ throw new IssuerNotTrustedException(e.getLocalizedMessage(),e);
+ }
+ }
+
+ /**
+ * Send a response
+ * @param responseDoc
+ * @param relayState
+ * @param response
+ * @throws IOException
+ * @throws GeneralSecurityException
+ */
+ public void send(Document responseDoc, String destination,
+ String relayState,
+ HttpServletResponse response,
+ boolean supportSignature,
+ PrivateKey signingKey) throws IOException, GeneralSecurityException
+ {
+ if(responseDoc == null)
+ throw new IllegalArgumentException("responseType is null");
+
+ byte[] responseBytes = null;
+ try
+ {
+ responseBytes = DocumentUtil.getDocumentAsString(responseDoc).getBytes("UTF-8");
+ }
+ catch (TransformerFactoryConfigurationError e)
+ {
+ if(trace) log.trace(e);
+ }
+ catch (TransformerException e)
+ {
+ if(trace) log.trace(e);
+ }
+
+ if(redirectProfile)
+ {
+ String urlEncodedResponse = RedirectBindingUtil.deflateBase64URLEncode(responseBytes);
+
+ if(trace) log.trace("IDP:Destination=" + destination);
+
+ if(relayState != null && relayState.length() > 0)
+ relayState = RedirectBindingUtil.urlEncode(relayState);
+
+ String finalDest = destination + getDestination(urlEncodedResponse, relayState,
+ supportSignature);
+ if(trace) log.trace("Redirecting to="+ finalDest);
+ HTTPRedirectUtil.sendRedirectForResponder(finalDest, response);
+ }
+ else
+ {
+ String samlResponse = PostBindingUtil.base64Encode(new String(responseBytes));
+
+ PostBindingUtil.sendPost(new DestinationInfoHolder(destination,
+ samlResponse, relayState), response, false);
+ }
+ }
+
+ /**
+ * Generate a Destination URL for the HTTPRedirect binding
+ * with the saml response and relay state
+ * @param urlEncodedResponse
+ * @param urlEncodedRelayState
+ * @return
+ */
+ public String getDestination(String urlEncodedResponse, String urlEncodedRelayState,
+ boolean supportSignature)
+ {
+ StringBuilder sb = new StringBuilder();
+
+ if (supportSignature)
+ {
+ try
+ {
+ sb.append(RedirectBindingSignatureUtil.getSAMLResponseURLWithSignature(urlEncodedResponse,
+ urlEncodedRelayState, keyManager.getSigningKey()));
+ }
+ catch (Exception e)
+ {
+ if(trace) log.trace(e);
+ }
+ }
+ else
+ {
+ sb.append("?SAMLResponse=").append(urlEncodedResponse);
+ if (urlEncodedRelayState != null && urlEncodedRelayState.length() > 0)
+ sb.append("&RelayState=").append(urlEncodedRelayState);
+ }
+ return sb.toString();
+ }
+
+ /**
+ * Create an Error Response
+ * @param responseURL
+ * @param status
+ * @param identityURL
+ * @param supportSignature
+ * @return
+ * @throws ConfigurationException
+ */
+ public Document getErrorResponse(String responseURL, String status,
+ String identityURL, boolean supportSignature)
+ {
+ Document samlResponse = null;
+ ResponseType responseType = null;
+
+ SAML2Response saml2Response = new SAML2Response();
+
+ //Create a response type
+ String id = IDGenerator.create("ID_");
+
+ IssuerInfoHolder issuerHolder = new IssuerInfoHolder(identityURL);
+ issuerHolder.setStatusCode(status);
+
+ IDPInfoHolder idp = new IDPInfoHolder();
+ idp.setNameIDFormatValue(null);
+ idp.setNameIDFormat(JBossSAMLURIConstants.NAMEID_FORMAT_PERSISTENT.get());
+
+ SPInfoHolder sp = new SPInfoHolder();
+ sp.setResponseDestinationURI(responseURL);
+ try
+ {
+ responseType = saml2Response.createResponseType(id, sp, idp, issuerHolder);
+ }
+ catch (ConfigurationException e1)
+ {
+ if(trace) log.trace(e1);
+ responseType = saml2Response.createResponseType();
+ }
+
+ //Lets see how the response looks like
+ if(log.isTraceEnabled())
+ {
+ log.trace("Error_ResponseType = ");
+ StringWriter sw = new StringWriter();
+ try
+ {
+ saml2Response.marshall(responseType, sw);
+ }
+ catch (JAXBException e)
+ {
+ log.trace(e);
+ }
+ catch (SAXException e)
+ {
+ log.trace(e);
+ }
+ log.trace("Response="+sw.toString());
+ }
+
+ if(supportSignature)
+ {
+ try
+ {
+ SAML2Signature ss = new SAML2Signature();
+ samlResponse = ss.sign(responseType, keyManager.getSigningKeyPair());
+ }
+ catch (Exception e)
+ {
+ if(trace) log.trace(e);
+ }
+ }
+ else
+ try
+ {
+ samlResponse = saml2Response.convert(responseType);
+ }
+ catch (Exception e)
+ {
+ if(trace) log.trace(e);
+ }
+
+ return samlResponse;
+ }
+
+ /**
+ * Given a SP or IDP issuer from the assertion, return the host
+ * @param domainURL
+ * @return
+ * @throws IOException
+ */
+ private static String getDomain(String domainURL) throws IOException
+ {
+ URL url = new URL(domainURL);
+ return url.getHost();
+ }
+}
\ No newline at end of file
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/circleoftrust/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/circleoftrust/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/circleoftrust/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,41 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>circleoftrust</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <packaging>war</packaging>
- <name>JBoss Identity Federation Circle Of Trust</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>circleoftrust</warName>
- <webappDirectory>${basedir}/resources/</webappDirectory>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/circleoftrust/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/circleoftrust/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/circleoftrust/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/circleoftrust/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>circleoftrust</artifactId>
+ <version>1.0.0.beta2</version>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation Circle Of Trust</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>circleoftrust</warName>
+ <webappDirectory>${basedir}/resources/</webappDirectory>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/employee/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/employee/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/employee/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>employee</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity Federation Web Apps Employee</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>employee</warName>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/employee/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/employee/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/employee/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/employee/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>employee</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation Web Apps Employee</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>employee</warName>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/fed-example/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/fed-example/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/fed-example/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,49 +0,0 @@
-<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>
- <parent>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <groupId>org.jboss.identity</groupId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- </parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>fed-example</artifactId>
- <packaging>ear</packaging>
- <name>fed-example JEE5 Assembly</name>
- <url>http://maven.apache.org</url>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <version>5</version>
- </configuration>
- </plugin>
- </plugins>
- <finalName>fed-example</finalName>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>idp-sig-no-val</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>seam-sp</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/fed-example/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/fed-example/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/fed-example/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/fed-example/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,49 @@
+<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>
+ <parent>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <groupId>org.jboss.identity</groupId>
+ <version>1.0.0.beta2</version>
+ </parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>fed-example</artifactId>
+ <packaging>ear</packaging>
+ <name>fed-example JEE5 Assembly</name>
+ <url>http://maven.apache.org</url>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <version>5</version>
+ </configuration>
+ </plugin>
+ </plugins>
+ <finalName>fed-example</finalName>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>idp-sig-no-val</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>seam-sp</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/idp/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,38 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>idp</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity Federation Identity Provider</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>idp</warName>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/idp/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>idp</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation Identity Provider</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>idp</warName>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/idp-sig/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>idp-sig</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity Federation Identity Provider that supports signature</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>idp-sig</warName>
- <webappDirectory>${basedir}/src/main/webapp/</webappDirectory>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/idp-sig/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>idp-sig</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation Identity Provider that supports signature</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>idp-sig</warName>
+ <webappDirectory>${basedir}/src/main/webapp/</webappDirectory>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig-no-val/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/idp-sig-no-val/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig-no-val/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>idp-sig-no-val</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity Federation Identity Provider that supports signature</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>idp-sig-no-val</warName>
- <webappDirectory>${basedir}/src/main/webapp/</webappDirectory>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig-no-val/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/idp-sig-no-val/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig-no-val/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-sig-no-val/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>idp-sig-no-val</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation Identity Provider that supports signature</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>idp-sig-no-val</warName>
+ <webappDirectory>${basedir}/src/main/webapp/</webappDirectory>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-standalone/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/idp-standalone/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-standalone/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>idp-standalone</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity Federation Identity Provider that supports signature and that is a simple web application that can hosted on any web container</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>idp-standalone</warName>
- <webappDirectory>${basedir}/src/main/webapp/</webappDirectory>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-standalone/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/idp-standalone/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-standalone/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/idp-standalone/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>idp-standalone</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation Identity Provider that supports signature and that is a simple web application that can hosted on any web container</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>idp-standalone</warName>
+ <webappDirectory>${basedir}/src/main/webapp/</webappDirectory>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/jboss-sts/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/jboss-sts/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/jboss-sts/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-sts</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity Federation Security Token Service</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>jboss-sts</warName>
- <!--webappDirectory>${basedir}/resources/</webappDirectory>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes-->
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/jboss-sts/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/jboss-sts/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/jboss-sts/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/jboss-sts/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-sts</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation Security Token Service</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>jboss-sts</warName>
+ <!--webappDirectory>${basedir}/resources/</webappDirectory>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes-->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/metadata/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/metadata/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/metadata/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>metadata</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity Federation Metadata</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>metadata</warName>
- <webappDirectory>${basedir}/resources/</webappDirectory>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/metadata/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/metadata/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/metadata/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/metadata/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>metadata</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation Metadata</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>metadata</warName>
+ <webappDirectory>${basedir}/resources/</webappDirectory>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-consumer/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/openid-consumer/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-consumer/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openid-consumer</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity Federation OpenID Consumer</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>openid-consumer</warName>
- <webappDirectory>${basedir}/resources/</webappDirectory>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-consumer/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/openid-consumer/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-consumer/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-consumer/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openid-consumer</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation OpenID Consumer</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>openid-consumer</warName>
+ <webappDirectory>${basedir}/resources/</webappDirectory>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-provider/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/openid-provider/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-provider/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openid-provider</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity Federation OpenID Provider</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>openid-provider</warName>
- <webappDirectory>${basedir}/resources/</webappDirectory>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-provider/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/openid-provider/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-provider/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/openid-provider/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openid-provider</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation OpenID Provider</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>openid-provider</warName>
+ <webappDirectory>${basedir}/resources/</webappDirectory>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pdp/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pdp/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,38 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>pdp</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity XACML PDP</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>XACML PDP Web Application for the JBoss Identity Project</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>pdp</warName>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pdp/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/pdp/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pdp/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pdp/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>pdp</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity XACML PDP</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>XACML PDP Web Application for the JBoss Identity Project</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>pdp</warName>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,44 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <packaging>pom</packaging>
- <name>JBoss Identity Federation Web Applications</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Web Applications contains the web
- applications for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <modules>
- <module>sales</module>
- <module>sales-sig</module>
- <module>sales-post-sig</module>
- <module>sales-standalone</module>
- <module>employee</module>
- <module>circleoftrust</module>
- <module>idp</module>
- <module>idp-sig</module>
- <module>idp-sig-no-val</module>
- <module>idp-standalone</module>
- <module>metadata</module>
- <module>openid-provider</module>
- <module>openid-consumer</module>
- <module>jboss-sts</module>
- <module>pdp</module>
- <module>seam-sp</module>
- <module>fed-example</module>
- </modules>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,44 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-parent</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Identity Federation Web Applications</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Web Applications contains the web
+ applications for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <modules>
+ <module>sales</module>
+ <module>sales-sig</module>
+ <module>sales-post-sig</module>
+ <module>sales-standalone</module>
+ <module>employee</module>
+ <module>circleoftrust</module>
+ <module>idp</module>
+ <module>idp-sig</module>
+ <module>idp-sig-no-val</module>
+ <module>idp-standalone</module>
+ <module>metadata</module>
+ <module>openid-provider</module>
+ <module>openid-consumer</module>
+ <module>jboss-sts</module>
+ <module>pdp</module>
+ <module>seam-sp</module>
+ <module>fed-example</module>
+ </modules>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/sales/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,38 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>sales</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity Federation Sales</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>sales</warName>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/sales/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>sales</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation Sales</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>sales</warName>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-post-sig/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/sales-post-sig/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-post-sig/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,38 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>sales-post-sig</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity Federation Sales App with http post signature</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>sales-post-sig</warName>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-post-sig/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/sales-post-sig/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-post-sig/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-post-sig/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>sales-post-sig</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation Sales App with http post signature</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>sales-post-sig</warName>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-sig/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/sales-sig/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-sig/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,38 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>sales-sig</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity Federation Sales with HTTP-Redirect and Signature</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>sales-sig</warName>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-sig/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/sales-sig/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-sig/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-sig/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>sales-sig</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation Sales with HTTP-Redirect and Signature</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>sales-sig</warName>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-standalone/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/sales-standalone/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-standalone/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>sales-standalone</artifactId>
- <packaging>war</packaging>
- <name>JBoss Identity Federation Sales Application that supports signature and that is a simple web application that can be hosted on any web container</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>sales-standalone</warName>
- <webappDirectory>${basedir}/src/main/webapp/</webappDirectory>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-standalone/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/sales-standalone/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-standalone/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/sales-standalone/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>sales-standalone</artifactId>
+ <packaging>war</packaging>
+ <name>JBoss Identity Federation Sales Application that supports signature and that is a simple web application that can be hosted on any web container</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Samples contains the samples for Federated Identity Needs.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>sales-standalone</warName>
+ <webappDirectory>${basedir}/src/main/webapp/</webappDirectory>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/seam-sp/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/seam-sp/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/seam-sp/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,87 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-federation-webapps</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>seam-sp</artifactId>
- <packaging>war</packaging>
- <name>Seam Service Provider</name>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-model</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-api</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-bindings</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-seam</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <version>2.1.2</version>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- <version>2.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug</artifactId>
- <version>2.1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- <version>5.0.0.CR1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>seam-sp</warName>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/seam-sp/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-webapps/seam-sp/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/seam-sp/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-webapps/seam-sp/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,87 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-federation-webapps</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>seam-sp</artifactId>
+ <packaging>war</packaging>
+ <name>Seam Service Provider</name>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-model</artifactId>
+ <version>1.0.0.beta2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-api</artifactId>
+ <version>1.0.0.beta2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-bindings</artifactId>
+ <version>1.0.0.beta2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-seam</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>2.1.2</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ <version>2.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-debug</artifactId>
+ <version>2.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ <version>5.0.0.CR1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <warName>seam-sp</warName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Deleted: identity-federation/tags/1.0.0.beta2/jboss-identity-xmlsec-model/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-xmlsec-model/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-xmlsec-model/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,112 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-identity-xmlsec-model</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Identity Federation XML Security Model</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Federation XML Security Model contains the JAXB2 model for W3C XML Signature and XML Encryption specifications.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
- <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>sun-jaf</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>codehaus-stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doclet>org.jboss.apiviz.APIviz</doclet>
- <docletArtifact>
- <groupId>org.jboss.apiviz</groupId>
- <artifactId>apiviz</artifactId>
- <version>1.2.5.GA</version>
- </docletArtifact>
- <additionalparam>
- -charset UTF-8
- -docencoding UTF-8
- -version
- -author
- -breakiterator
- -windowtitle "${project.name} ${project.version} API Reference"
- -doctitle "${project.name} ${project.version} API Reference"
- -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
- -link http://java.sun.com/javase/6/docs/api/
- -sourceclasspath ${project.build.outputDirectory}
- </additionalparam>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
Copied: identity-federation/tags/1.0.0.beta2/jboss-identity-xmlsec-model/pom.xml (from rev 791, identity-federation/trunk/jboss-identity-xmlsec-model/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/jboss-identity-xmlsec-model/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/jboss-identity-xmlsec-model/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,112 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-parent</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-identity-xmlsec-model</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Identity Federation XML Security Model</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Federation XML Security Model contains the JAXB2 model for W3C XML Signature and XML Encryption specifications.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaf</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>codehaus-stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam>
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/parent/pom.xml
===================================================================
--- identity-federation/trunk/parent/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/parent/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,165 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>4</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-parent</artifactId>
- <packaging>pom</packaging>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <name>JBoss Identity Federation- Parent</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/identity-federation/...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/identity-federation/tag...</developerConnection>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/jbossidentity/identity-federation/tags</tagBase>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- <argLine>${surefire.jvm.args}</argLine>
- <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.4.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>apache-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.0.3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1.9</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.9</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbossxacml</artifactId>
- <version>2.0.3.SP2</version>
- </dependency>
- <dependency>
- <groupId>org.openid4java</groupId>
- <artifactId>openid4java</artifactId>
- <version>0.9.5</version>
- </dependency>
- <dependency>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>1.9.12</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.18</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>6.1.18</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-</project>
Copied: identity-federation/tags/1.0.0.beta2/parent/pom.xml (from rev 791, identity-federation/trunk/parent/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/parent/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/parent/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,165 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0.beta2</version>
+ <name>JBoss Identity Federation- Parent</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/identity-federation/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/identity-federation/tag...</developerConnection>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/jbossidentity/identity-federation/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>${surefire.jvm.args}</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>1.4.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>apache-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1.9</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.9</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbossxacml</artifactId>
+ <version>2.0.3.SP2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java</artifactId>
+ <version>0.9.5</version>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.12</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.18</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.18</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Deleted: identity-federation/tags/1.0.0.beta2/pom.xml
===================================================================
--- identity-federation/trunk/pom.xml 2009-09-14 20:32:37 UTC (rev 789)
+++ identity-federation/tags/1.0.0.beta2/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -1,42 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-parent</artifactId>
- <version>1.0.0.beta1-SNAPSHOT</version>
- <relativePath>parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed-pom</artifactId>
- <packaging>pom</packaging>
- <name>JBoss Identity Federation- Aggregator</name>
- <url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description>JBoss Identity Federation is the federated identity project for JEMS projects</description>
-
- <modules>
- <module>parent</module>
- <module>jboss-identity-xmlsec-model</module>
- <module>jboss-identity-fed-model</module>
- <module>jboss-identity-fed-core</module>
- <module>jboss-identity-fed-api</module>
- <module>jboss-identity-web</module>
- <module>jboss-identity-bindings</module>
- <module>jboss-identity-bindings-jboss</module>
- <module>jboss-identity-webapps</module>
- <module>jboss-identity-seam</module>
- <module>assembly</module>
- </modules>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
Copied: identity-federation/tags/1.0.0.beta2/pom.xml (from rev 791, identity-federation/trunk/pom.xml)
===================================================================
--- identity-federation/tags/1.0.0.beta2/pom.xml (rev 0)
+++ identity-federation/tags/1.0.0.beta2/pom.xml 2009-09-14 22:53:59 UTC (rev 792)
@@ -0,0 +1,42 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-parent</artifactId>
+ <version>1.0.0.beta2</version>
+ <relativePath>parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed-pom</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Identity Federation- Aggregator</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity Federation is the federated identity project for JEMS projects</description>
+
+ <modules>
+ <module>parent</module>
+ <module>jboss-identity-xmlsec-model</module>
+ <module>jboss-identity-fed-model</module>
+ <module>jboss-identity-fed-core</module>
+ <module>jboss-identity-fed-api</module>
+ <module>jboss-identity-web</module>
+ <module>jboss-identity-bindings</module>
+ <module>jboss-identity-bindings-jboss</module>
+ <module>jboss-identity-webapps</module>
+ <module>jboss-identity-seam</module>
+ <module>assembly</module>
+ </modules>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
14 years, 7 months
- 1
- 0