Picketlink SVN: r1006 - federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-06-16 16:55:45 -0400 (Thu, 16 Jun 2011)
New Revision: 1006
Removed:
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/ObjectFactory.java
Modified:
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/package-info.java
Log:
use non-jaxb
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java 2011-06-16 20:29:31 UTC (rev 1005)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java 2011-06-16 20:55:45 UTC (rev 1006)
@@ -1,29 +1,28 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2008.12.17 at 12:32:20 PM CST
-//
-
-
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.picketlink.identity.federation.ws.wss.utility;
-import java.util.HashMap;
-import java.util.Map;
+import org.picketlink.identity.federation.ws.addressing.BaseAddressingType;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-
/**
*
* This type is for elements whose [children] is a psuedo-dateTime and can have arbitrary attributes.
@@ -45,86 +44,62 @@
*
*
*/
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributedDateTime", propOrder = {
- "value"
-})
-public class AttributedDateTime {
+public class AttributedDateTime extends BaseAddressingType
+{
- @XmlValue
- protected String value;
- @XmlAttribute(name = "Id", namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...")
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- @XmlID
- @XmlSchemaType(name = "ID")
- protected String id;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ protected String value;
- /**
- * Gets the value of the value property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getValue() {
- return value;
- }
+ protected String id;
- /**
- * Sets the value of the value property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setValue(String value) {
- this.value = value;
- }
+ /**
+ * Gets the value of the value property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getValue()
+ {
+ return value;
+ }
- /**
- * Gets the value of the id property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getId() {
- return id;
- }
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
- /**
- * Sets the value of the id property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setId(String value) {
- this.id = value;
- }
+ /**
+ * Gets the value of the id property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getId()
+ {
+ return id;
+ }
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- *
- * <p>
- * the map is keyed by the name of the attribute and
- * the value is the string value of the attribute.
- *
- * the map returned by this method is live, and you can add new attribute
- * by updating the map directly. Because of this design, there's no setter.
- *
- *
- * @return
- * always non-null
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-
-}
+ /**
+ * Sets the value of the id property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setId(String value)
+ {
+ this.id = value;
+ }
+}
\ No newline at end of file
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java 2011-06-16 20:29:31 UTC (rev 1005)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java 2011-06-16 20:55:45 UTC (rev 1006)
@@ -1,29 +1,28 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2008.12.17 at 12:32:20 PM CST
-//
-
-
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.picketlink.identity.federation.ws.wss.utility;
-import java.util.HashMap;
-import java.util.Map;
+import org.picketlink.identity.federation.ws.addressing.BaseAddressingType;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-
/**
*
* This type is for elements whose [children] is an anyURI and can have arbitrary attributes.
@@ -45,87 +44,63 @@
*
*
*/
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributedURI", propOrder = {
- "value"
-})
-public class AttributedURI {
- @XmlValue
- @XmlSchemaType(name = "anyURI")
- protected String value;
- @XmlAttribute(name = "Id", namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...")
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- @XmlID
- @XmlSchemaType(name = "ID")
- protected String id;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+public class AttributedURI extends BaseAddressingType
+{
- /**
- * Gets the value of the value property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getValue() {
- return value;
- }
+ protected String value;
- /**
- * Sets the value of the value property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setValue(String value) {
- this.value = value;
- }
+ protected String id;
- /**
- * Gets the value of the id property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getId() {
- return id;
- }
+ /**
+ * Gets the value of the value property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getValue()
+ {
+ return value;
+ }
- /**
- * Sets the value of the id property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setId(String value) {
- this.id = value;
- }
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- *
- * <p>
- * the map is keyed by the name of the attribute and
- * the value is the string value of the attribute.
- *
- * the map returned by this method is live, and you can add new attribute
- * by updating the map directly. Because of this design, there's no setter.
- *
- *
- * @return
- * always non-null
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
+ /**
+ * Gets the value of the id property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getId()
+ {
+ return id;
+ }
-}
+ /**
+ * Sets the value of the id property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setId(String value)
+ {
+ this.id = value;
+ }
+}
\ No newline at end of file
Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/ObjectFactory.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/ObjectFactory.java 2011-06-16 20:29:31 UTC (rev 1005)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/ObjectFactory.java 2011-06-16 20:55:45 UTC (rev 1006)
@@ -1,96 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2008.12.17 at 12:32:20 PM CST
-//
-
-
-package org.picketlink.identity.federation.ws.wss.utility;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.oasis_open.docs.wss._2004._01.oasis_200401_wss_wssecurity_utility_1_0 package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
-@XmlRegistry
-public class ObjectFactory {
-
- private final static QName _Expires_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...", "Expires");
- private final static QName _Created_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...", "Created");
- private final static QName _Timestamp_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...", "Timestamp");
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.oasis_open.docs.wss._2004._01.oasis_200401_wss_wssecurity_utility_1_0
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link TimestampType }
- *
- */
- public TimestampType createTimestampType() {
- return new TimestampType();
- }
-
- /**
- * Create an instance of {@link AttributedDateTime }
- *
- */
- public AttributedDateTime createAttributedDateTime() {
- return new AttributedDateTime();
- }
-
- /**
- * Create an instance of {@link AttributedURI }
- *
- */
- public AttributedURI createAttributedURI() {
- return new AttributedURI();
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link AttributedDateTime }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...", name = "Expires")
- public JAXBElement<AttributedDateTime> createExpires(AttributedDateTime value) {
- return new JAXBElement<AttributedDateTime>(_Expires_QNAME, AttributedDateTime.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link AttributedDateTime }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...", name = "Created")
- public JAXBElement<AttributedDateTime> createCreated(AttributedDateTime value) {
- return new JAXBElement<AttributedDateTime>(_Created_QNAME, AttributedDateTime.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link TimestampType }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...", name = "Timestamp")
- public JAXBElement<TimestampType> createTimestamp(TimestampType value) {
- return new JAXBElement<TimestampType>(_Timestamp_QNAME, TimestampType.class, null, value);
- }
-
-}
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java 2011-06-16 20:29:31 UTC (rev 1005)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java 2011-06-16 20:55:45 UTC (rev 1006)
@@ -1,34 +1,28 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2008.12.17 at 12:32:20 PM CST
-//
-
-
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.picketlink.identity.federation.ws.wss.utility;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.picketlink.identity.federation.ws.addressing.AnyAddressingType;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-
/**
*
* This complex type ties together the timestamp related elements into a composite type.
@@ -57,146 +51,89 @@
*
*
*/
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TimestampType", propOrder = {
- "created",
- "expires",
- "any"
-})
-public class TimestampType {
+public class TimestampType extends AnyAddressingType
+{
+ protected AttributedDateTime created;
- @XmlElement(name = "Created")
- protected AttributedDateTime created;
- @XmlElement(name = "Expires")
- protected AttributedDateTime expires;
- @XmlAnyElement(lax = true)
- protected List<Object> any;
- @XmlAttribute(name = "Id", namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...")
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- @XmlID
- @XmlSchemaType(name = "ID")
- protected String id;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ protected AttributedDateTime expires;
- /**
- * Gets the value of the created property.
- *
- * @return
- * possible object is
- * {@link AttributedDateTime }
- *
- */
- public AttributedDateTime getCreated() {
- return created;
- }
+ protected String id;
- /**
- * Sets the value of the created property.
- *
- * @param value
- * allowed object is
- * {@link AttributedDateTime }
- *
- */
- public void setCreated(AttributedDateTime value) {
- this.created = value;
- }
+ /**
+ * Gets the value of the created property.
+ *
+ * @return
+ * possible object is
+ * {@link AttributedDateTime }
+ *
+ */
+ public AttributedDateTime getCreated()
+ {
+ return created;
+ }
- /**
- * Gets the value of the expires property.
- *
- * @return
- * possible object is
- * {@link AttributedDateTime }
- *
- */
- public AttributedDateTime getExpires() {
- return expires;
- }
+ /**
+ * Sets the value of the created property.
+ *
+ * @param value
+ * allowed object is
+ * {@link AttributedDateTime }
+ *
+ */
+ public void setCreated(AttributedDateTime value)
+ {
+ this.created = value;
+ }
- /**
- * Sets the value of the expires property.
- *
- * @param value
- * allowed object is
- * {@link AttributedDateTime }
- *
- */
- public void setExpires(AttributedDateTime value) {
- this.expires = value;
- }
+ /**
+ * Gets the value of the expires property.
+ *
+ * @return
+ * possible object is
+ * {@link AttributedDateTime }
+ *
+ */
+ public AttributedDateTime getExpires()
+ {
+ return expires;
+ }
- /**
- * Gets the value of the any property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the any property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAny().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link Element }
- *
- *
- */
- public List<Object> getAny() {
- if (any == null) {
- any = new ArrayList<Object>();
- }
- return this.any;
- }
+ /**
+ * Sets the value of the expires property.
+ *
+ * @param value
+ * allowed object is
+ * {@link AttributedDateTime }
+ *
+ */
+ public void setExpires(AttributedDateTime value)
+ {
+ this.expires = value;
+ }
- /**
- * Gets the value of the id property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getId() {
- return id;
- }
+ /**
+ * Gets the value of the id property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getId()
+ {
+ return id;
+ }
- /**
- * Sets the value of the id property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setId(String value) {
- this.id = value;
- }
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- *
- * <p>
- * the map is keyed by the name of the attribute and
- * the value is the string value of the attribute.
- *
- * the map returned by this method is live, and you can add new attribute
- * by updating the map directly. Because of this design, there's no setter.
- *
- *
- * @return
- * always non-null
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-
-}
+ /**
+ * Sets the value of the id property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setId(String value)
+ {
+ this.id = value;
+ }
+}
\ No newline at end of file
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/package-info.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/package-info.java 2011-06-16 20:29:31 UTC (rev 1005)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/package-info.java 2011-06-16 20:55:45 UTC (rev 1006)
@@ -1,9 +1,23 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2008.12.17 at 12:32:20 PM CST
-//
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.identity.federation.ws.wss.utility;
-(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.picketlink.identity.federation.ws.wss.utility;
12 years, 11 months
Picketlink SVN: r1005 - integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-06-16 16:29:31 -0400 (Thu, 16 Jun 2011)
New Revision: 1005
Modified:
integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java
Log:
use the non-jaxb method
Modified: integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java
===================================================================
--- integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java 2011-06-16 20:27:47 UTC (rev 1004)
+++ integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java 2011-06-16 20:29:31 UTC (rev 1005)
@@ -271,7 +271,7 @@
// set the client secret in the client entropy.
EntropyType clientEntropy = new EntropyType();
- clientEntropy.getAny().add(clientBinarySecret);
+ clientEntropy.addAny(clientBinarySecret);
request.setEntropy(clientEntropy);
// dispatch the request and get the issued assertion.
@@ -309,7 +309,7 @@
// include a UseKey section that specifies the certificate in the request.
UseKeyType useKey = new UseKeyType();
- useKey.setAny(Base64.encodeBytes(certificate.getEncoded()).getBytes());
+ useKey.add(Base64.encodeBytes(certificate.getEncoded()).getBytes());
request.setUseKey(useKey);
// dispatch the request and get the issued assertion.
@@ -345,7 +345,7 @@
// include a UseKey section that sets the public key in the request.
KeyValueType keyValue = WSTrustUtil.createKeyValue(certificate.getPublicKey());
UseKeyType useKey = new UseKeyType();
- useKey.setAny(keyValue);
+ useKey.add(keyValue);
request.setUseKey(useKey);
// dispatch the request and get the issued assertion.
12 years, 11 months
Picketlink SVN: r1003 - trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-06-13 21:24:38 -0400 (Mon, 13 Jun 2011)
New Revision: 1003
Modified:
trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java
Log:
properly handle the handler chain
Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java
===================================================================
--- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java 2011-06-14 01:14:09 UTC (rev 1002)
+++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java 2011-06-14 01:24:38 UTC (rev 1003)
@@ -152,18 +152,35 @@
String handlerStr = (String) options.get("handlerChain");
- //Lets utilize the login module options
- if( handlerStr != null && handlerStr.contains("binary"))
+ if(StringUtil.isNotNull(handlerStr))
{
- BinaryTokenHandler binaryTokenHandler = new BinaryTokenHandler();
-
- handlers.add(binaryTokenHandler);
+ List<String> tokens = StringUtil.tokenize(handlerStr);
+ for(String token: tokens)
+ {
+ if(token.equalsIgnoreCase("binary"))
+ {
+ BinaryTokenHandler binaryTokenHandler = new BinaryTokenHandler();
+ handlers.add(binaryTokenHandler);
+ }
+ else if(token.equalsIgnoreCase("saml2"))
+ {
+ SAML2Handler samlHandler = new SAML2Handler();
+ handlers.add(samlHandler);
+ }
+ else
+ {
+ ClassLoader cl = SecurityActions.getClassLoader(getClass());
+ try
+ {
+ handlers.add((Handler) cl.loadClass(token).newInstance());
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Unable to instantiate handler:"+token, e);
+ }
+ }
+ }
}
- else if( handlerStr != null && handlerStr.contains("saml2"))
- {
- SAML2Handler samlHandler = new SAML2Handler();
- handlers.add(samlHandler);
- }
binding.setHandlerChain(handlers);
12 years, 11 months
Picketlink SVN: r1002 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-06-13 21:14:09 -0400 (Mon, 13 Jun 2011)
New Revision: 1002
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java
Log:
deal with roles from saml assertion
Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java 2011-06-14 00:02:59 UTC (rev 1001)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java 2011-06-14 01:14:09 UTC (rev 1002)
@@ -792,13 +792,15 @@
roleKeys.addAll(StringUtil.tokenize(roleKey));
List<String> roles = AssertionUtil.getRoles(assertion, roleKeys);
-
- SimpleGroup group = new SimpleGroup(SecurityConstants.ROLES_IDENTIFIER);
- for (String role : roles)
+ if (roles.size() > 0)
{
- group.addMember(new SimplePrincipal(role));
+ SimpleGroup group = new SimpleGroup(SecurityConstants.ROLES_IDENTIFIER);
+ for (String role : roles)
+ {
+ group.addMember(new SimplePrincipal(role));
+ }
+ subject.getPrincipals().add(group);
}
- subject.getPrincipals().add(group);
}
if (injectCallerPrincipalGroup)
12 years, 11 months
Picketlink SVN: r1001 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-06-13 20:02:59 -0400 (Mon, 13 Jun 2011)
New Revision: 1001
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java
Log:
deal with roles from saml assertion
Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java 2011-06-13 23:52:49 UTC (rev 1000)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java 2011-06-14 00:02:59 UTC (rev 1001)
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.security.Principal;
import java.security.acl.Group;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -48,6 +49,7 @@
import org.jboss.security.mapping.MappingContext;
import org.jboss.security.mapping.MappingManager;
import org.jboss.security.mapping.MappingType;
+import org.picketlink.identity.federation.core.constants.AttributeConstants;
import org.picketlink.identity.federation.core.constants.PicketLinkFederationConstants;
import org.picketlink.identity.federation.core.exceptions.ParsingException;
import org.picketlink.identity.federation.core.factories.JBossAuthCacheInvalidationFactory;
@@ -150,8 +152,8 @@
*
* <h3>Additional Configuration</h3>
* <p>
- * groupPrincipalName: If you want the group principal in the subject representing the subject roles to have a name that is different
- * from "Roles".
+ * roleKey: By default, the saml attributes with key "Role" are assumed to represent user roles. You can configure a comma
+ * separated list of string values to represent the attribute names for user roles.
* </p>
*
* <p>cache.invalidation: set it to true if you require invalidation of JBoss Auth Cache at SAML Principal expiration.</p>
@@ -192,10 +194,9 @@
public static final String STS_CONFIG_FILE = "configFile";
/**
- * Historically, JBoss has used the "Roles" as the group principal name in the subject
- * to represent the subject roles. Users can customize this name with this option.
+ * Attribute names indicating the user roles
*/
- public static final String GROUP_PRINCIPAL_NAME = "groupPrincipalName";
+ public static final String ROLE_KEY = "roleKey";
/**
* Key to specify the end point address
@@ -274,9 +275,9 @@
protected boolean useOptionsCredentials;
/**
- * Name of the group principal. If unconfigured, will be "null"
+ * Name of the saml attribute representing roles. Can be csv
*/
- protected String groupPrincipalName = null;
+ protected String roleKey = AttributeConstants.ROLE_IDENTIFIER_ASSERTION;
protected boolean enableCacheInvalidation = false;
@@ -325,9 +326,9 @@
if (useOptionsCreds != null)
useOptionsCredentials = useOptionsCreds.booleanValue();
- final String gpPrincipalName = (String) options.get(GROUP_PRINCIPAL_NAME);
- if (gpPrincipalName != null && gpPrincipalName.length() > 0)
- groupPrincipalName = gpPrincipalName;
+ final String roleKeyStr = (String) options.get(ROLE_KEY);
+ if (roleKeyStr != null && roleKeyStr.length() > 0)
+ roleKey = roleKeyStr;
String cacheInvalidation = (String) options.get("cache.invalidation");
if (cacheInvalidation != null && !cacheInvalidation.isEmpty())
@@ -777,24 +778,29 @@
roleMappingContext.performMapping(contextMap, null);
RoleGroup group = roleMappingContext.getMappingResult().getMappedObject();
- SimpleGroup rolePrincipal = null;
+ SimpleGroup rolePrincipal = new SimpleGroup(group.getRoleName());
- if (groupPrincipalName != null)
- {
- rolePrincipal = new SimpleGroup(groupPrincipalName);
- }
- else
- {
- rolePrincipal = new SimpleGroup(group.getRoleName());
- }
-
for (Role role : group.getRoles())
{
rolePrincipal.addMember(new SimplePrincipal(role.getRoleName()));
}
subject.getPrincipals().add(rolePrincipal);
}
+ else
+ {
+ List<String> roleKeys = new ArrayList<String>();
+ roleKeys.addAll(StringUtil.tokenize(roleKey));
+ List<String> roles = AssertionUtil.getRoles(assertion, roleKeys);
+
+ SimpleGroup group = new SimpleGroup(SecurityConstants.ROLES_IDENTIFIER);
+ for (String role : roles)
+ {
+ group.addMember(new SimplePrincipal(role));
+ }
+ subject.getPrincipals().add(group);
+ }
+
if (injectCallerPrincipalGroup)
{
Group callerPrincipal = new SimpleGroup("CallerPrincipal");
12 years, 11 months
Picketlink SVN: r1000 - trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-06-13 19:52:49 -0400 (Mon, 13 Jun 2011)
New Revision: 1000
Modified:
trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java
Log:
PLFED-185: use StringUtil
Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java
===================================================================
--- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java 2011-06-13 23:52:28 UTC (rev 999)
+++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java 2011-06-13 23:52:49 UTC (rev 1000)
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.StringTokenizer;
import javax.security.jacc.PolicyContext;
import javax.security.jacc.PolicyContextException;
@@ -39,6 +38,7 @@
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.soap.SOAPMessageContext;
+import org.picketlink.identity.federation.core.util.StringUtil;
import org.picketlink.trust.jbossws.Constants;
import org.picketlink.trust.jbossws.Util;
@@ -420,11 +420,9 @@
private List<String> getHeaderNames(String str)
{
List<String> list = new ArrayList<String>();
-
- StringTokenizer st = new StringTokenizer(str, ",");
- while(st.hasMoreElements())
+ if(StringUtil.isNotNull(str))
{
- list.add(st.nextToken());
+ list.addAll(StringUtil.tokenize(str));
}
return list;
}
12 years, 11 months
Picketlink SVN: r999 - in federation/trunk: picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth and 4 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-06-13 19:52:28 -0400 (Mon, 13 Jun 2011)
New Revision: 999
Modified:
federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java
federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/roles/DefaultRoleGenerator.java
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/IDPServlet.java
Log:
PLFED-185: use StringUtil
Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
===================================================================
--- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2011-06-13 22:38:24 UTC (rev 998)
+++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2011-06-13 23:52:28 UTC (rev 999)
@@ -35,7 +35,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.StringTokenizer;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -157,14 +156,10 @@
//Set a list of attributes we are interested in separated by comma
public void setAttributeList(String attribList)
{
- if (attribList != null && !"".equals(attribList))
+ if (StringUtil.isNotNull(attribList))
{
this.attributeKeys.clear();
- StringTokenizer st = new StringTokenizer(attribList, ",");
- while (st != null && st.hasMoreTokens())
- {
- this.attributeKeys.add(st.nextToken());
- }
+ this.attributeKeys.addAll(StringUtil.tokenize(attribList));
}
}
Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java
===================================================================
--- federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-06-13 22:38:24 UTC (rev 998)
+++ federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-06-13 23:52:28 UTC (rev 999)
@@ -437,7 +437,10 @@
}
List<String> roleKeys = new ArrayList<String>();
- roleKeys.addAll(StringUtil.tokenize(roleKey));
+ if (StringUtil.isNotNull(roleKey))
+ {
+ roleKeys.addAll(StringUtil.tokenize(roleKey));
+ }
String groupName = SecurityConstants.ROLES_IDENTIFIER;
Group rolesGroup = new PicketLinkGroup(groupName);
Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java 2011-06-13 22:38:24 UTC (rev 998)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java 2011-06-13 23:52:28 UTC (rev 999)
@@ -45,6 +45,7 @@
import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil;
import org.picketlink.identity.federation.core.saml.v2.writers.SAMLMetadataWriter;
import org.picketlink.identity.federation.core.util.StaxUtil;
+import org.picketlink.identity.federation.core.util.StringUtil;
import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType;
@@ -61,127 +62,124 @@
public class FileBasedMetadataConfigurationStore implements IMetadataConfigurationStore
{
private static Logger log = Logger.getLogger(FileBasedMetadataConfigurationStore.class);
- private boolean trace = log.isTraceEnabled();
-
+
+ private final boolean trace = log.isTraceEnabled();
+
private String userHome = null;
-
+
private String baseDirectory = null;
-
+
public FileBasedMetadataConfigurationStore()
{
bootstrap();
}
-
+
/**
* @see {@code IMetadataConfigurationStore#bootstrap()}
*/
public void bootstrap()
- {
+ {
userHome = SecurityActions.getSystemProperty("user.home");
- if(userHome == null)
+ if (userHome == null)
throw new RuntimeException("user.home system property not set");
-
- StringBuilder builder = new StringBuilder( userHome );
- builder.append( PicketLinkFederationConstants.FILE_STORE_DIRECTORY );
+
+ StringBuilder builder = new StringBuilder(userHome);
+ builder.append(PicketLinkFederationConstants.FILE_STORE_DIRECTORY);
baseDirectory = builder.toString();
-
- File plStore = new File( baseDirectory );
- if(plStore.exists() == false)
+
+ File plStore = new File(baseDirectory);
+ if (plStore.exists() == false)
{
- if(trace)
+ if (trace)
log.trace(plStore.getPath() + " does not exist. Hence creating.");
plStore.mkdir();
}
}
-
+
/**
* @see IMetadataConfigurationStore#getIdentityProviderID()
*/
public Set<String> getIdentityProviderID()
- {
+ {
Set<String> identityProviders = new HashSet<String>();
-
+
Properties idp = new Properties();
-
- StringBuilder builder = new StringBuilder( baseDirectory );
- builder.append( PicketLinkFederationConstants.IDP_PROPERTIES );
-
- File identityProviderFile = new File( builder.toString() );
- if( identityProviderFile.exists() )
+
+ StringBuilder builder = new StringBuilder(baseDirectory);
+ builder.append(PicketLinkFederationConstants.IDP_PROPERTIES);
+
+ File identityProviderFile = new File(builder.toString());
+ if (identityProviderFile.exists())
{
try
{
- idp.load( new FileInputStream( identityProviderFile ));
+ idp.load(new FileInputStream(identityProviderFile));
String listOfIDP = (String) idp.get("IDP");
-
- //Comma separated list
- StringTokenizer st = new StringTokenizer( listOfIDP, ",");
- while( st.hasMoreTokens() )
+ if (StringUtil.isNotNull(listOfIDP))
{
- String token = st.nextToken();
- identityProviders.add( token );
+ identityProviders.addAll(StringUtil.tokenize(listOfIDP));
}
}
catch (Exception e)
{
- log.error( "Exception loading the identity providers:", e );
- }
- }
+ log.error("Exception loading the identity providers:", e);
+ }
+ }
return identityProviders;
}
-
+
/**
* @see IMetadataConfigurationStore#getServiceProviderID()
*/
public Set<String> getServiceProviderID()
- {
+ {
Set<String> serviceProviders = new HashSet<String>();
-
- Properties sp = new Properties();
- StringBuilder builder = new StringBuilder( baseDirectory );
- builder.append( PicketLinkFederationConstants.SP_PROPERTIES );
-
- File serviceProviderFile = new File( builder.toString() );
-
- if( serviceProviderFile.exists() )
+
+ Properties sp = new Properties();
+ StringBuilder builder = new StringBuilder(baseDirectory);
+ builder.append(PicketLinkFederationConstants.SP_PROPERTIES);
+
+ File serviceProviderFile = new File(builder.toString());
+
+ if (serviceProviderFile.exists())
{
try
{
- sp.load( new FileInputStream( serviceProviderFile ));
+ sp.load(new FileInputStream(serviceProviderFile));
String listOfSP = (String) sp.get("SP");
-
+
//Comma separated list
- StringTokenizer st = new StringTokenizer( listOfSP, "," );
- while( st.hasMoreTokens() )
+ StringTokenizer st = new StringTokenizer(listOfSP, ",");
+ while (st.hasMoreTokens())
{
String token = st.nextToken();
- serviceProviders.add( token );
+ serviceProviders.add(token);
}
}
catch (Exception e)
{
- log.error( "Exception loading the service providers:", e );
- }
- }
+ log.error("Exception loading the service providers:", e);
+ }
+ }
return serviceProviders;
}
-
+
/**
* @see IMetadataConfigurationStore#load(String)
- */
+ */
public EntityDescriptorType load(String id) throws IOException
{
File persistedFile = validateIdAndReturnMDFile(id);
-
-
+
SAMLEntityDescriptorParser parser = new SAMLEntityDescriptorParser();
try
{
- return (EntityDescriptorType) parser.parse( StaxParserUtil.getXMLEventReader( new FileInputStream( persistedFile )) );
+ return (EntityDescriptorType) parser.parse(StaxParserUtil
+ .getXMLEventReader(new FileInputStream(persistedFile)));
}
catch (ParsingException e)
{
- throw new RuntimeException( e );
+ throw new RuntimeException(e);
}
}
@@ -189,52 +187,53 @@
* @see IMetadataConfigurationStore#persist(EntityDescriptorType, String)
*/
public void persist(EntityDescriptorType entity, String id) throws IOException
- {
+ {
File persistedFile = validateIdAndReturnMDFile(id);
-
+
try
{
- XMLStreamWriter streamWriter = StaxUtil.getXMLStreamWriter( new FileOutputStream( persistedFile ));
- SAMLMetadataWriter writer = new SAMLMetadataWriter( streamWriter );
-
+ XMLStreamWriter streamWriter = StaxUtil.getXMLStreamWriter(new FileOutputStream(persistedFile));
+ SAMLMetadataWriter writer = new SAMLMetadataWriter(streamWriter);
+
writer.writeEntityDescriptor(entity);
}
catch (ProcessingException e)
{
- throw new RuntimeException( e );
- }
- if(trace) log.trace("Persisted into " + persistedFile.getPath());
-
+ throw new RuntimeException(e);
+ }
+ if (trace)
+ log.trace("Persisted into " + persistedFile.getPath());
+
//Process the EDT
List<EDTChoiceType> edtChoiceTypeList = entity.getChoiceType();
- for( EDTChoiceType edtChoiceType : edtChoiceTypeList )
+ for (EDTChoiceType edtChoiceType : edtChoiceTypeList)
{
List<EDTDescriptorChoiceType> edtDescriptorChoiceTypeList = edtChoiceType.getDescriptors();
- for( EDTDescriptorChoiceType edtDesc : edtDescriptorChoiceTypeList )
+ for (EDTDescriptorChoiceType edtDesc : edtDescriptorChoiceTypeList)
{
IDPSSODescriptorType idpSSO = edtDesc.getIdpDescriptor();
- if( idpSSO != null )
+ if (idpSSO != null)
{
addIdentityProvider(id);
}
SPSSODescriptorType spSSO = edtDesc.getSpDescriptor();
- if( spSSO != null )
+ if (spSSO != null)
{
addServiceProvider(id);
}
- }
- }
+ }
+ }
}
/**
* @see IMetadataConfigurationStore#delete(String)
*/
- public void delete(String id)
+ public void delete(String id)
{
File persistedFile = validateIdAndReturnMDFile(id);
-
- if(persistedFile.exists())
- persistedFile.delete();
+
+ if (persistedFile.exists())
+ persistedFile.delete();
}
/**
@@ -243,7 +242,7 @@
* @see IMetadataConfigurationStore#loadTrustedProviders(String)
*/
@SuppressWarnings("unchecked")
- public Map<String, String> loadTrustedProviders(String id) throws IOException, ClassNotFoundException
+ public Map<String, String> loadTrustedProviders(String id) throws IOException, ClassNotFoundException
{
File trustedFile = validateIdAndReturnTrustedProvidersFile(id);
ObjectInputStream ois = null;
@@ -251,150 +250,149 @@
{
ois = new ObjectInputStream(new FileInputStream(trustedFile));
Map<String, String> trustedMap = (Map<String, String>) ois.readObject();
- return trustedMap;
+ return trustedMap;
}
finally
{
- if(ois != null)
+ if (ois != null)
ois.close();
- }
+ }
}
/**
* @throws IOException
* @see IMetadataConfigurationStore#persistTrustedProviders(Map)
*/
- public void persistTrustedProviders(String id, Map<String, String> trusted)
- throws IOException
- {
+ public void persistTrustedProviders(String id, Map<String, String> trusted) throws IOException
+ {
File trustedFile = validateIdAndReturnTrustedProvidersFile(id);
ObjectOutputStream oos = null;
try
{
oos = new ObjectOutputStream(new FileOutputStream(trustedFile));
- oos.writeObject(trusted);
+ oos.writeObject(trusted);
}
finally
{
- if(oos != null)
+ if (oos != null)
oos.close();
}
- if(trace) log.trace("Persisted trusted map into "+ trustedFile.getPath());
+ if (trace)
+ log.trace("Persisted trusted map into " + trustedFile.getPath());
}
-
+
/**
* @see IMetadataConfigurationStore#deleteTrustedProviders(String)
*/
- public void deleteTrustedProviders(String id)
+ public void deleteTrustedProviders(String id)
{
File persistedFile = validateIdAndReturnTrustedProvidersFile(id);
-
- if(persistedFile.exists())
- persistedFile.delete();
+
+ if (persistedFile.exists())
+ persistedFile.delete();
}
-
+
private File validateIdAndReturnMDFile(String id)
{
String serializationExtension = PicketLinkFederationConstants.SERIALIZATION_EXTENSION;
-
- if(id == null)
+
+ if (id == null)
throw new IllegalArgumentException("id is null");
- if( !id.endsWith( serializationExtension ))
+ if (!id.endsWith(serializationExtension))
id += serializationExtension;
-
- StringBuilder builder = new StringBuilder( baseDirectory );
- builder.append( "/").append( id );
-
- return new File( builder.toString() );
+
+ StringBuilder builder = new StringBuilder(baseDirectory);
+ builder.append("/").append(id);
+
+ return new File(builder.toString());
}
-
+
private File validateIdAndReturnTrustedProvidersFile(String id)
{
- if(id == null)
+ if (id == null)
throw new IllegalArgumentException("id is null");
-
- id += "-trusted" + PicketLinkFederationConstants.SERIALIZATION_EXTENSION;
- StringBuilder builder = new StringBuilder( baseDirectory );
- builder.append( "/").append( id );
-
- return new File( builder.toString() );
+ id += "-trusted" + PicketLinkFederationConstants.SERIALIZATION_EXTENSION;
+
+ StringBuilder builder = new StringBuilder(baseDirectory);
+ builder.append("/").append(id);
+
+ return new File(builder.toString());
}
-
- private void addServiceProvider( String id )
- {
- Properties sp = new Properties();
- StringBuilder builder = new StringBuilder( baseDirectory );
- builder.append( PicketLinkFederationConstants.SP_PROPERTIES );
-
- File serviceProviderFile = new File( builder.toString() );
-
+ private void addServiceProvider(String id)
+ {
+ Properties sp = new Properties();
+
+ StringBuilder builder = new StringBuilder(baseDirectory);
+ builder.append(PicketLinkFederationConstants.SP_PROPERTIES);
+
+ File serviceProviderFile = new File(builder.toString());
+
try
{
- if( serviceProviderFile.exists() == false )
+ if (serviceProviderFile.exists() == false)
serviceProviderFile.createNewFile();
-
- sp.load( new FileInputStream( serviceProviderFile ));
- String listOfSP = (String) sp.get("SP");
- if( listOfSP == null )
- {
- listOfSP = id;
- }
- else
- {
- listOfSP += "," + id;
- }
- sp.put( "SP", listOfSP );
-
- sp.store( new FileWriter( serviceProviderFile ), "");
+
+ sp.load(new FileInputStream(serviceProviderFile));
+ String listOfSP = (String) sp.get("SP");
+ if (listOfSP == null)
+ {
+ listOfSP = id;
+ }
+ else
+ {
+ listOfSP += "," + id;
+ }
+ sp.put("SP", listOfSP);
+
+ sp.store(new FileWriter(serviceProviderFile), "");
}
catch (Exception e)
{
- log.error( "Exception loading the service providers:", e );
- }
+ log.error("Exception loading the service providers:", e);
+ }
}
-
- private void addIdentityProvider( String id )
- {
- Properties idp = new Properties();
- StringBuilder builder = new StringBuilder( baseDirectory );
- builder.append( PicketLinkFederationConstants.IDP_PROPERTIES );
-
- File idpProviderFile = new File( builder.toString() );
-
+ private void addIdentityProvider(String id)
+ {
+ Properties idp = new Properties();
+
+ StringBuilder builder = new StringBuilder(baseDirectory);
+ builder.append(PicketLinkFederationConstants.IDP_PROPERTIES);
+
+ File idpProviderFile = new File(builder.toString());
+
try
{
- if( idpProviderFile.exists() == false )
+ if (idpProviderFile.exists() == false)
idpProviderFile.createNewFile();
-
- idp.load( new FileInputStream( idpProviderFile ));
- String listOfIDP = (String) idp.get("IDP");
- if( listOfIDP == null )
- {
- listOfIDP = id;
- }
- else
- {
- listOfIDP += "," + id;
- }
- idp.put( "IDP", listOfIDP );
-
- idp.store( new FileWriter( idpProviderFile ), "");
+
+ idp.load(new FileInputStream(idpProviderFile));
+ String listOfIDP = (String) idp.get("IDP");
+ if (listOfIDP == null)
+ {
+ listOfIDP = id;
+ }
+ else
+ {
+ listOfIDP += "," + id;
+ }
+ idp.put("IDP", listOfIDP);
+
+ idp.store(new FileWriter(idpProviderFile), "");
}
catch (Exception e)
{
- log.error( "Exception loading the identity providers:", e );
- }
+ log.error("Exception loading the identity providers:", e);
+ }
}
-
/**
* @see {@code IMetadataConfigurationStore#cleanup()}
*/
public void cleanup()
- {
- }
+ {
+ }
}
\ No newline at end of file
Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java
===================================================================
--- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2011-06-13 22:38:24 UTC (rev 998)
+++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2011-06-13 23:52:28 UTC (rev 999)
@@ -542,7 +542,10 @@
if (handlerConfig.containsKey(ROLE_KEY))
{
String roleKey = (String) handlerConfig.getParameter(ROLE_KEY);
- roleKeys.addAll(StringUtil.tokenize(roleKey));
+ if (StringUtil.isNotNull(roleKey))
+ {
+ roleKeys.addAll(StringUtil.tokenize(roleKey));
+ }
}
List<ASTChoiceType> attList = attributeStatement.getAttributes();
Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/roles/DefaultRoleGenerator.java
===================================================================
--- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/roles/DefaultRoleGenerator.java 2011-06-13 22:38:24 UTC (rev 998)
+++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/roles/DefaultRoleGenerator.java 2011-06-13 23:52:28 UTC (rev 999)
@@ -27,9 +27,9 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import java.util.StringTokenizer;
-
+
import org.picketlink.identity.federation.core.interfaces.RoleGenerator;
+import org.picketlink.identity.federation.core.util.StringUtil;
/**
* Simple Role Generator that looks
@@ -42,14 +42,14 @@
public class DefaultRoleGenerator implements RoleGenerator
{
private static Properties props = new Properties();
-
+
static
{
try
{
ClassLoader tcl = SecurityActions.getContextClassLoader();
InputStream is = tcl.getResourceAsStream("roles.properties");
- if(is == null)
+ if (is == null)
throw new RuntimeException("roles.properties not found");
props.load(is);
}
@@ -62,13 +62,11 @@
public List<String> generateRoles(Principal principal)
{
List<String> roles = new ArrayList<String>();
-
- String csv = (String) props.get(principal.getName());
- //lets break the roles string
- StringTokenizer st = new StringTokenizer(csv,",");
- while(st != null && st.hasMoreTokens())
+
+ String csv = (String) props.get(principal.getName());
+ if (StringUtil.isNotNull(csv))
{
- roles.add(st.nextToken());
+ roles.addAll(StringUtil.tokenize(csv));
}
return roles;
}
Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/IDPServlet.java
===================================================================
--- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/IDPServlet.java 2011-06-13 22:38:24 UTC (rev 998)
+++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/IDPServlet.java 2011-06-13 23:52:28 UTC (rev 999)
@@ -34,7 +34,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.StringTokenizer;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -242,13 +241,9 @@
//Get a list of attributes we are interested in
String attribList = config.getInitParameter(GeneralConstants.ATTRIBUTE_KEYS);
- if (attribList != null && !"".equals(attribList))
+ if (StringUtil.isNotNull(attribList))
{
- StringTokenizer st = new StringTokenizer(attribList, ",");
- while (st != null && st.hasMoreTokens())
- {
- this.attributeKeys.add(st.nextToken());
- }
+ this.attributeKeys.addAll(StringUtil.tokenize(attribList));
}
//The Identity Server on the servlet context gets set
12 years, 11 months
Picketlink SVN: r998 - in federation/trunk: picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth and 1 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-06-13 18:38:24 -0400 (Mon, 13 Jun 2011)
New Revision: 998
Modified:
federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java
federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/SAML2STSLoginModuleUnitTestCase.java
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/constants/AttributeConstants.java
Log:
make seeking roles flexible from the SAMl assertion
Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java
===================================================================
--- federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-06-13 22:37:39 UTC (rev 997)
+++ federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-06-13 22:38:24 UTC (rev 998)
@@ -51,7 +51,9 @@
import org.jboss.security.plugins.JaasSecurityDomain;
import org.picketlink.identity.federation.bindings.jboss.subject.PicketLinkGroup;
import org.picketlink.identity.federation.bindings.jboss.subject.PicketLinkPrincipal;
+import org.picketlink.identity.federation.core.constants.AttributeConstants;
import org.picketlink.identity.federation.core.constants.PicketLinkFederationConstants;
+import org.picketlink.identity.federation.core.exceptions.ProcessingException;
import org.picketlink.identity.federation.core.factories.JBossAuthCacheInvalidationFactory;
import org.picketlink.identity.federation.core.factories.JBossAuthCacheInvalidationFactory.TimeCacheExpiry;
import org.picketlink.identity.federation.core.saml.v2.util.AssertionUtil;
@@ -85,7 +87,7 @@
* <ul>jboss.security.security_domain: name of the security domain where this login module is configured. This is only required
* if the cache.invalidation option is configured.
* </ul>
- * <ul>groupPrincipalName: if you do not want the Roles in the subject to be "Roles", then set it to a different value</ul>
+ * <ul>roleKey: a comma separated list of strings that define the attributes in SAML assertion for user roles</ul>
* <ul>localValidation: if you want to validate the assertion locally for signature and expiry</ul>
* </li>
* </p>
@@ -134,12 +136,12 @@
protected String securityDomain = null;
- protected String groupName = SecurityConstants.ROLES_IDENTIFIER;
-
protected boolean localValidation = false;
protected String localValidationSecurityDomain;
+ protected String roleKey = AttributeConstants.ROLE_IDENTIFIER_ASSERTION;
+
/**
* Options that are computed by this login module.
* Few options are removed and the rest are set in the dispatch sts call
@@ -214,10 +216,10 @@
throw new RuntimeException("Please configure option:" + SecurityConstants.SECURITY_DOMAIN_OPTION);
}
- String groupNameStr = (String) options.get("groupPrincipalName");
- if (StringUtil.isNotNull(groupNameStr))
+ String roleKeyStr = (String) options.get("roleKey");
+ if (StringUtil.isNotNull(roleKeyStr))
{
- groupName = groupNameStr.trim();
+ roleKey = roleKeyStr.trim();
}
String localValidationStr = (String) options.get("localValidation");
@@ -423,10 +425,21 @@
throw le;
}
}
+ if (trace)
+ {
+ try
+ {
+ log.trace("Assertion from where roles will be sought=" + AssertionUtil.asString(assertion));
+ }
+ catch (ProcessingException ignore)
+ {
+ }
+ }
List<String> roleKeys = new ArrayList<String>();
- roleKeys.add("Role");
+ roleKeys.addAll(StringUtil.tokenize(roleKey));
+ String groupName = SecurityConstants.ROLES_IDENTIFIER;
Group rolesGroup = new PicketLinkGroup(groupName);
List<String> roles = AssertionUtil.getRoles(assertion, roleKeys);
for (String role : roles)
Modified: federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/SAML2STSLoginModuleUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/SAML2STSLoginModuleUnitTestCase.java 2011-06-13 22:37:39 UTC (rev 997)
+++ federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/SAML2STSLoginModuleUnitTestCase.java 2011-06-13 22:38:24 UTC (rev 998)
@@ -79,6 +79,7 @@
options.put("localValidation", "true");
options.put("localValidationSecurityDomain", "someSD");
options.put("localTestingOnly", "true");
+ options.put("roleKey", "Role,SomeAttrib");
AppConfigurationEntry a2 = new AppConfigurationEntry(SAML2STSLoginModule.class.getName(),
LoginModuleControlFlag.REQUIRED, options);
@@ -101,6 +102,8 @@
roles.add("test1");
roles.add("test2");
assertion.addStatement(StatementUtil.createAttributeStatement(roles));
+ assertion.addStatement(StatementUtil.createAttributeStatement("SomeAttrib", "testX"));
+
try
{
SamlCredential cred = new SamlCredential(AssertionUtil.asString(assertion));
@@ -129,6 +132,6 @@
Group gp = groups.iterator().next();
assertTrue(gp.isMember(new SimplePrincipal("test1")));
assertTrue(gp.isMember(new SimplePrincipal("test2")));
+ assertTrue(gp.isMember(new SimplePrincipal("testX")));
}
-
}
\ No newline at end of file
Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/constants/AttributeConstants.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/constants/AttributeConstants.java 2011-06-13 22:37:39 UTC (rev 997)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/constants/AttributeConstants.java 2011-06-13 22:38:24 UTC (rev 998)
@@ -29,4 +29,7 @@
public interface AttributeConstants
{
String ROLES = "roles";
+
+ /** Default identifier in the saml2 attribute statements to indicate role **/
+ String ROLE_IDENTIFIER_ASSERTION = "Role";
}
\ No newline at end of file
12 years, 11 months
Picketlink SVN: r997 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-06-13 18:37:39 -0400 (Mon, 13 Jun 2011)
New Revision: 997
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/StatementUtil.java
Log:
add method to create arbitrary attrib stmt
Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/StatementUtil.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/StatementUtil.java 2011-06-13 20:37:09 UTC (rev 996)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/StatementUtil.java 2011-06-13 22:37:39 UTC (rev 997)
@@ -154,6 +154,22 @@
return attrStatement;
}
+ /**
+ * Given an attribute type and a value, create {@link AttributeStatementType}
+ * @param key attribute type
+ * @param value attribute value
+ * @return
+ */
+ public static AttributeStatementType createAttributeStatement(String key, String value)
+ {
+ AttributeStatementType attrStatement = new AttributeStatementType();
+ AttributeType attr = new AttributeType(key);
+ attr.addAttributeValue(value);
+ attrStatement.addAttribute(new ASTChoiceType(attr));
+
+ return attrStatement;
+ }
+
private static AttributeType getX500Attribute(String name)
{
AttributeType att = new AttributeType(name);
12 years, 11 months
Picketlink SVN: r996 - in social/trunk/webapps: openid-consumer and 7 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-06-13 16:37:09 -0400 (Mon, 13 Jun 2011)
New Revision: 996
Modified:
social/trunk/webapps/
social/trunk/webapps/openid-consumer/
social/trunk/webapps/openid-consumer/resources/
social/trunk/webapps/openid-consumer/resources/META-INF/
social/trunk/webapps/openid-consumer/resources/WEB-INF/
social/trunk/webapps/openid-provider/
social/trunk/webapps/openid-provider/resources/
social/trunk/webapps/openid-provider/resources/META-INF/
social/trunk/webapps/openid-provider/resources/WEB-INF/
Log:
svn ig
Property changes on: social/trunk/webapps
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata
Property changes on: social/trunk/webapps/openid-consumer
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata
Property changes on: social/trunk/webapps/openid-consumer/resources
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata
Property changes on: social/trunk/webapps/openid-consumer/resources/META-INF
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata
Property changes on: social/trunk/webapps/openid-consumer/resources/WEB-INF
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata
Property changes on: social/trunk/webapps/openid-provider
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata
Property changes on: social/trunk/webapps/openid-provider/resources
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata
Property changes on: social/trunk/webapps/openid-provider/resources/META-INF
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata
Property changes on: social/trunk/webapps/openid-provider/resources/WEB-INF
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata
12 years, 11 months