[jboss-identity-commits] JBoss Identity SVN: r428 - in identity-federation/trunk: identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config and 7 other directories.

Monday, 6 April 2009

Author: sguilhen(a)redhat.com
Date: 2009-04-06 13:59:41 -0400 (Mon, 06 Apr 2009)
New Revision: 428

Added:
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/STSType.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProviderType.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProvidersType.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProviderType.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProvidersType.java
Removed:
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/trust/
  
identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-sts.xsd
Modified:
   identity-federation/trunk/identity-bindings-jboss/.classpath
   identity-federation/trunk/identity-bindings/.classpath
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTS.java
  
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTSConfiguration.java
  
identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd
   identity-federation/trunk/identity-fed-api/.classpath
   identity-federation/trunk/identity-fed-core/.classpath
   identity-federation/trunk/identity-fed-model/.classpath
   identity-federation/trunk/identity-xmlsecmodel/.classpath
Log:
JBID-75: Merged the STS configuration schema into jboss-identity-fed.xsd, generated the
new object model and updated the STS classes accordingly.

Modified: identity-federation/trunk/identity-bindings/.classpath
===================================================================

--- identity-federation/trunk/identity-bindings/.classpath	2009-04-06 17:57:14 UTC (rev
427)
+++ identity-federation/trunk/identity-bindings/.classpath	2009-04-06 17:59:41 UTC (rev
428)
@@ -1,26 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-fed-api"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-fed-core"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-fed-model"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-xmlsecmodel"/>
-	<classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/org/jboss/security/jboss-xacml/2.0.3.CR4"/>
-	<classpathentry kind="var"
path="M2_REPO/org/jboss/security/jboss-xacml/2.0.3.CR4/jboss-xacml-2.0.3.CR4.jar"
sourcepath="/M2_REPO/org/jboss/security/jboss-xacml/2.0.3.CR4/jboss-xacml-2.0.3.CR4-sources.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/catalina/6.0.18/catalina-6.0.18.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/junit/junit/4.5/junit-4.5.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/annotations-api/6.0.18/annotations-api-6.0.18.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/apache-tomcat/tomcat-util/5.5.12/tomcat-util-5.5.12.jar"/>
-	<classpathentry kind="output" path="target-eclipse"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources"
excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/test/java"
output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources"
output="target/test-classes" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/annotations-api/6.0.18/annotations-api-6.0.18.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/catalina/6.0.18/catalina-6.0.18.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-modeler/commons-modeler/1.1patch/commons-modeler-1.1patch.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/coyote/6.0.18/coyote-6.0.18.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"
sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"
sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/>
+  <classpathentry kind="src" path="/jboss-identity-fed-api"/>
+  <classpathentry kind="src" path="/jboss-identity-fed-core"/>
+  <classpathentry kind="src"
path="/jboss-identity-fed-model"/>
+  <classpathentry kind="src"
path="/jboss-identity-xmlsec-model"/>
+  <classpathentry kind="var"
path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar"
sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/juli/6.0.18/juli-6.0.18.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"
sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-tomcat/naming-resources/5.5.12/naming-resources-5.5.12.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/servlet-api/6.0.18/servlet-api-6.0.18.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-tomcat/tomcat-http/5.5.12/tomcat-http-5.5.12.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-tomcat/tomcat-util/5.5.12/tomcat-util-5.5.12.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/>
+</classpath>
\ No newline at end of file

Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.02.12 at 11:14:14 AM CST 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
 //
 
 

Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.02.12 at 11:14:14 AM CST 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
 //
 
 

Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.02.12 at 11:14:14 AM CST 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
 //
 
 

Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.02.12 at 11:14:14 AM CST 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
 //
 
 

Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.02.12 at 11:14:14 AM CST 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
 //
 
 

Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.02.12 at 11:14:14 AM CST 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
 //
 
 

Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.02.12 at 11:14:14 AM CST 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
 //
 
 
@@ -17,7 +17,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the org.jboss.identity.federation.bindings.config package. 
+ * generated in the jboss.identity_federation.config._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -32,21 +32,22 @@
 public class ObjectFactory {
 
     private final static QName _JBossIDP_QNAME = new
QName("urn:jboss:identity-federation:config:1.0", "JBossIDP");
+    private final static QName _JBossSTS_QNAME = new
QName("urn:jboss:identity-federation:config:1.0", "JBossSTS");
     private final static QName _JBossSP_QNAME = new
QName("urn:jboss:identity-federation:config:1.0", "JBossSP");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema
derived classes for package: org.jboss.identity.federation.bindings.config
+     * Create a new ObjectFactory that can be used to create new instances of schema
derived classes for package: jboss.identity_federation.config._1
      * 
      */
     public ObjectFactory() {
     }
 
     /**
-     * Create an instance of {@link AuthPropertyType }
+     * Create an instance of {@link SPType }
      * 
      */
-    public AuthPropertyType createAuthPropertyType() {
-        return new AuthPropertyType();
+    public SPType createSPType() {
+        return new SPType();
     }
 
     /**
@@ -58,6 +59,14 @@
     }
 
     /**
+     * Create an instance of {@link ProviderType }
+     * 
+     */
+    public ProviderType createProviderType() {
+        return new ProviderType();
+    }
+
+    /**
      * Create an instance of {@link EncryptionType }
      * 
      */
@@ -66,14 +75,30 @@
     }
 
     /**
-     * Create an instance of {@link KeyValueType }
+     * Create an instance of {@link AuthPropertyType }
      * 
      */
-    public KeyValueType createKeyValueType() {
-        return new KeyValueType();
+    public AuthPropertyType createAuthPropertyType() {
+        return new AuthPropertyType();
     }
 
     /**
+     * Create an instance of {@link TrustType }
+     * 
+     */
+    public TrustType createTrustType() {
+        return new TrustType();
+    }
+
+    /**
+     * Create an instance of {@link STSType }
+     * 
+     */
+    public STSType createSTSType() {
+        return new STSType();
+    }
+
+    /**
      * Create an instance of {@link IDPType }
      * 
      */
@@ -82,30 +107,46 @@
     }
 
     /**
-     * Create an instance of {@link SPType }
+     * Create an instance of {@link ServiceProviderType }
      * 
      */
-    public SPType createSPType() {
-        return new SPType();
+    public ServiceProviderType createServiceProviderType() {
+        return new ServiceProviderType();
     }
 
     /**
-     * Create an instance of {@link TrustType }
+     * Create an instance of {@link TokenProvidersType }
      * 
      */
-    public TrustType createTrustType() {
-        return new TrustType();
+    public TokenProvidersType createTokenProvidersType() {
+        return new TokenProvidersType();
     }
 
     /**
-     * Create an instance of {@link ProviderType }
+     * Create an instance of {@link KeyValueType }
      * 
      */
-    public ProviderType createProviderType() {
-        return new ProviderType();
+    public KeyValueType createKeyValueType() {
+        return new KeyValueType();
     }
 
     /**
+     * Create an instance of {@link TokenProviderType }
+     * 
+     */
+    public TokenProviderType createTokenProviderType() {
+        return new TokenProviderType();
+    }
+
+    /**
+     * Create an instance of {@link ServiceProvidersType }
+     * 
+     */
+    public ServiceProvidersType createServiceProvidersType() {
+        return new ServiceProvidersType();
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link IDPType }{@code
>}}
      * 
      */
@@ -115,6 +156,15 @@
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link STSType }{@code
>}}
+     * 
+     */
+    @XmlElementDecl(namespace = "urn:jboss:identity-federation:config:1.0",
name = "JBossSTS")
+    public JAXBElement<STSType> createJBossSTS(STSType value) {
+        return new JAXBElement<STSType>(_JBossSTS_QNAME, STSType.class, null,
value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link SPType }{@code
>}}
      * 
      */

Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.02.12 at 11:14:14 AM CST 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
 //
 
 
@@ -54,8 +54,8 @@
     "keyProvider"
 })
 @XmlSeeAlso({
-    IDPType.class,
-    SPType.class
+    SPType.class,
+    IDPType.class
 })
 public class ProviderType {
 

Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.02.12 at 11:14:14 AM CST 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
 //
 
 

Added:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/STSType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/STSType.java	
                       (rev 0)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/STSType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -0,0 +1,237 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
+//
+
+
+package org.jboss.identity.federation.bindings.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for STSType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ * 
+ * <pre>
+ * &lt;complexType name="STSType">
+ *   &lt;complexContent>
+ *     &lt;restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="STSName"
type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="TokenTimeout"
type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *         &lt;element name="EncryptToken"
type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="KeyProvider"
type="{urn:jboss:identity-federation:config:1.0}KeyProviderType"
minOccurs="0"/>
+ *         &lt;element name="RequestHandler"
type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="TokenProviders"
type="{urn:jboss:identity-federation:config:1.0}TokenProvidersType"
minOccurs="0"/>
+ *         &lt;element name="ServiceProviders"
type="{urn:jboss:identity-federation:config:1.0}ServiceProvidersType"
minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "STSType", propOrder = {
+    "stsName",
+    "tokenTimeout",
+    "encryptToken",
+    "keyProvider",
+    "requestHandler",
+    "tokenProviders",
+    "serviceProviders"
+})
+public class STSType {
+
+    @XmlElement(name = "STSName", defaultValue = "JBossSTS")
+    protected String stsName;
+    @XmlElement(name = "TokenTimeout", defaultValue = "3600")
+    protected Integer tokenTimeout;
+    @XmlElement(name = "EncryptToken", defaultValue = "false")
+    protected Boolean encryptToken;
+    @XmlElement(name = "KeyProvider")
+    protected KeyProviderType keyProvider;
+    @XmlElement(name = "RequestHandler")
+    protected String requestHandler;
+    @XmlElement(name = "TokenProviders")
+    protected TokenProvidersType tokenProviders;
+    @XmlElement(name = "ServiceProviders")
+    protected ServiceProvidersType serviceProviders;
+
+    /**
+     * Gets the value of the stsName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSTSName() {
+        return stsName;
+    }
+
+    /**
+     * Sets the value of the stsName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSTSName(String value) {
+        this.stsName = value;
+    }
+
+    /**
+     * Gets the value of the tokenTimeout property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Integer }
+     *     
+     */
+    public Integer getTokenTimeout() {
+        return tokenTimeout;
+    }
+
+    /**
+     * Sets the value of the tokenTimeout property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Integer }
+     *     
+     */
+    public void setTokenTimeout(Integer value) {
+        this.tokenTimeout = value;
+    }
+
+    /**
+     * Gets the value of the encryptToken property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isEncryptToken() {
+        return encryptToken;
+    }
+
+    /**
+     * Sets the value of the encryptToken property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setEncryptToken(Boolean value) {
+        this.encryptToken = value;
+    }
+
+    /**
+     * Gets the value of the keyProvider property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link KeyProviderType }
+     *     
+     */
+    public KeyProviderType getKeyProvider() {
+        return keyProvider;
+    }
+
+    /**
+     * Sets the value of the keyProvider property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link KeyProviderType }
+     *     
+     */
+    public void setKeyProvider(KeyProviderType value) {
+        this.keyProvider = value;
+    }
+
+    /**
+     * Gets the value of the requestHandler property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRequestHandler() {
+        return requestHandler;
+    }
+
+    /**
+     * Sets the value of the requestHandler property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRequestHandler(String value) {
+        this.requestHandler = value;
+    }
+
+    /**
+     * Gets the value of the tokenProviders property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TokenProvidersType }
+     *     
+     */
+    public TokenProvidersType getTokenProviders() {
+        return tokenProviders;
+    }
+
+    /**
+     * Sets the value of the tokenProviders property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TokenProvidersType }
+     *     
+     */
+    public void setTokenProviders(TokenProvidersType value) {
+        this.tokenProviders = value;
+    }
+
+    /**
+     * Gets the value of the serviceProviders property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceProvidersType }
+     *     
+     */
+    public ServiceProvidersType getServiceProviders() {
+        return serviceProviders;
+    }
+
+    /**
+     * Sets the value of the serviceProviders property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceProvidersType }
+     *     
+     */
+    public void setServiceProviders(ServiceProvidersType value) {
+        this.serviceProviders = value;
+    }
+
+}

Added:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProviderType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProviderType.java	
                       (rev 0)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProviderType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -0,0 +1,132 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
+//
+
+
+package org.jboss.identity.federation.bindings.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ * 				The service provider type contains information about a specific service provider.
In particular,
+ * 				it specifies the type of the token that must be issued for the provider and the
alias of the
+ * 				provider's PKC in the truststore. This is used by the STS to locate the PKC
when encrypting the
+ * 				generated token. 
+ * 			
+ * 
+ * <p>Java class for ServiceProviderType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ServiceProviderType">
+ *   &lt;complexContent>
+ *     &lt;restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="TruststoreAlias"
type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="TokenType"
type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="endpoint"
type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ServiceProviderType", propOrder = {
+    "truststoreAlias",
+    "tokenType"
+})
+public class ServiceProviderType {
+
+    @XmlElement(name = "TruststoreAlias")
+    protected String truststoreAlias;
+    @XmlElement(name = "TokenType", required = true)
+    protected String tokenType;
+    @XmlAttribute
+    protected String endpoint;
+
+    /**
+     * Gets the value of the truststoreAlias property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTruststoreAlias() {
+        return truststoreAlias;
+    }
+
+    /**
+     * Sets the value of the truststoreAlias property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTruststoreAlias(String value) {
+        this.truststoreAlias = value;
+    }
+
+    /**
+     * Gets the value of the tokenType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTokenType() {
+        return tokenType;
+    }
+
+    /**
+     * Sets the value of the tokenType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTokenType(String value) {
+        this.tokenType = value;
+    }
+
+    /**
+     * Gets the value of the endpoint property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getEndpoint() {
+        return endpoint;
+    }
+
+    /**
+     * Sets the value of the endpoint property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEndpoint(String value) {
+        this.endpoint = value;
+    }
+
+}

Added:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProvidersType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProvidersType.java	
                       (rev 0)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProvidersType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -0,0 +1,80 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
+//
+
+
+package org.jboss.identity.federation.bindings.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ * 				The service providers specify the token type expected by each service provider.
+ * 			
+ * 
+ * <p>Java class for ServiceProvidersType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ServiceProvidersType">
+ *   &lt;complexContent>
+ *     &lt;restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ServiceProvider"
type="{urn:jboss:identity-federation:config:1.0}ServiceProviderType"
maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ServiceProvidersType", propOrder = {
+    "serviceProvider"
+})
+public class ServiceProvidersType {
+
+    @XmlElement(name = "ServiceProvider", required = true)
+    protected List<ServiceProviderType> serviceProvider;
+
+    /**
+     * Gets the value of the serviceProvider 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
serviceProvider property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getServiceProvider().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ServiceProviderType }
+     * 
+     * 
+     */
+    public List<ServiceProviderType> getServiceProvider() {
+        if (serviceProvider == null) {
+            serviceProvider = new ArrayList<ServiceProviderType>();
+        }
+        return this.serviceProvider;
+    }
+
+}

Added:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProviderType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProviderType.java	
                       (rev 0)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProviderType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -0,0 +1,97 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
+//
+
+
+package org.jboss.identity.federation.bindings.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for TokenProviderType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TokenProviderType">
+ *   &lt;complexContent>
+ *     &lt;restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ProviderClass"
type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="TokenType"
type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TokenProviderType", propOrder = {
+    "providerClass",
+    "tokenType"
+})
+public class TokenProviderType {
+
+    @XmlElement(name = "ProviderClass", required = true)
+    protected String providerClass;
+    @XmlElement(name = "TokenType", required = true)
+    protected String tokenType;
+
+    /**
+     * Gets the value of the providerClass property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getProviderClass() {
+        return providerClass;
+    }
+
+    /**
+     * Sets the value of the providerClass property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setProviderClass(String value) {
+        this.providerClass = value;
+    }
+
+    /**
+     * Gets the value of the tokenType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTokenType() {
+        return tokenType;
+    }
+
+    /**
+     * Sets the value of the tokenType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTokenType(String value) {
+        this.tokenType = value;
+    }
+
+}

Added:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProvidersType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProvidersType.java	
                       (rev 0)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProvidersType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -0,0 +1,82 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
+//
+
+
+package org.jboss.identity.federation.bindings.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ * 				The token providers specify the classes that handle the requests for each type of
security Token.
+ * 				For example, a SAMLTokenProvider may be used to generate SAML token, while a
X509TokenProvider
+ * 				may be used to generate X.509 tokens (certificates).
+ * 			
+ * 
+ * <p>Java class for TokenProvidersType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TokenProvidersType">
+ *   &lt;complexContent>
+ *     &lt;restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="TokenProvider"
type="{urn:jboss:identity-federation:config:1.0}TokenProviderType"
maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TokenProvidersType", propOrder = {
+    "tokenProvider"
+})
+public class TokenProvidersType {
+
+    @XmlElement(name = "TokenProvider", required = true)
+    protected List<TokenProviderType> tokenProvider;
+
+    /**
+     * Gets the value of the tokenProvider 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
tokenProvider property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getTokenProvider().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TokenProviderType }
+     * 
+     * 
+     */
+    public List<TokenProviderType> getTokenProvider() {
+        if (tokenProvider == null) {
+            tokenProvider = new ArrayList<TokenProviderType>();
+        }
+        return this.tokenProvider;
+    }
+
+}

Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.02.12 at 11:14:14 AM CST 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
 //
 
 

Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.02.12 at 11:14:14 AM CST 
+// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 
 //
 
 @javax.xml.bind.annotation.XmlSchema(namespace =
"urn:jboss:identity-federation:config:1.0", elementFormDefault =
javax.xml.bind.annotation.XmlNsForm.QUALIFIED)

Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTS.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTS.java	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTS.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -26,7 +26,7 @@
 
 import javax.annotation.Resource;
 import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.JAXBElement;
 import javax.xml.transform.Source;
 import javax.xml.ws.Service;
 import javax.xml.ws.ServiceMode;
@@ -46,7 +46,7 @@
 import
org.jboss.identity.federation.api.wstrust.protocol.RequestSecurityTokenCollection;
 import org.jboss.identity.federation.api.wstrust.protocol.RequestSecurityTokenResponse;
 import
org.jboss.identity.federation.api.wstrust.protocol.RequestSecurityTokenResponseCollection;
-import org.jboss.identity.federation.bindings.config.trust.JBossSTSConfig;
+import org.jboss.identity.federation.bindings.config.STSType;
 
 /**
  * <p>
@@ -153,6 +153,7 @@
     * 
     * @return an instance of {@code STSConfiguration} containing the STS configuration
properties.
     */
+   @SuppressWarnings("unchecked")
    protected STSConfiguration getConfiguration()
    {
       // get the configuration file and parse it.
@@ -164,9 +165,9 @@
       {
          InputStream stream = configurationFile.openStream();
          JAXBContext context =
JAXBContext.newInstance("org.jboss.identity.federation.bindings.config.trust");
-         Unmarshaller unmarshaller = context.createUnmarshaller();
-         JBossSTSConfig jbossConfig = (JBossSTSConfig) unmarshaller.unmarshal(stream);
-         return new JBossSTSConfiguration(jbossConfig);
+         JAXBElement element = (JAXBElement)
context.createUnmarshaller().unmarshal(stream);
+         STSType stsConfig = (STSType) element.getValue();
+         return new JBossSTSConfiguration(stsConfig);
       }
       catch (Exception e)
       {

Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTSConfiguration.java
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTSConfiguration.java	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTSConfiguration.java	2009-04-06
17:59:41 UTC (rev 428)
@@ -27,11 +27,11 @@
 
 import org.jboss.identity.federation.api.wstrust.STSConfiguration;
 import org.jboss.identity.federation.api.wstrust.SecurityTokenProvider;
-import org.jboss.identity.federation.bindings.config.trust.JBossSTSConfig;
-import org.jboss.identity.federation.bindings.config.trust.ServiceProvider;
-import org.jboss.identity.federation.bindings.config.trust.ServiceProviders;
-import org.jboss.identity.federation.bindings.config.trust.TokenProvider;
-import org.jboss.identity.federation.bindings.config.trust.TokenProviders;
+import org.jboss.identity.federation.bindings.config.STSType;
+import org.jboss.identity.federation.bindings.config.ServiceProviderType;
+import org.jboss.identity.federation.bindings.config.ServiceProvidersType;
+import org.jboss.identity.federation.bindings.config.TokenProviderType;
+import org.jboss.identity.federation.bindings.config.TokenProvidersType;
 
 /**
  * <p>
@@ -43,11 +43,11 @@
 {
 
    // the delegate contains all the information extracted from the jboss-sts.xml
configuration file.
-   private final JBossSTSConfig delegate;
+   private final STSType delegate;
 
    private final Map<String, SecurityTokenProvider> tokenProviders = new
HashMap<String, SecurityTokenProvider>();
 
-   private final Map<String, ServiceProvider> spMetadata = new HashMap<String,
ServiceProvider>();
+   private final Map<String, ServiceProviderType> spMetadata = new
HashMap<String, ServiceProviderType>();
 
    private final Map<String, Object> options = new HashMap<String,
Object>();
 
@@ -56,7 +56,7 @@
     */
    public JBossSTSConfiguration()
    {
-      this.delegate = new JBossSTSConfig();
+      this.delegate = new STSType();
       // set the default values in the delegate.
       this.delegate.setSTSName("JBossSTS");
       this.delegate.setEncryptToken(false);
@@ -68,7 +68,7 @@
     * 
     * @param config
     */
-   public JBossSTSConfiguration(JBossSTSConfig config)
+   public JBossSTSConfiguration(STSType config)
    {
       this.delegate = config;
       // set the default request handler if one hasn't been specified.
@@ -76,10 +76,10 @@
         
this.delegate.setRequestHandler("org.jboss.identity.federation.api.wstrust.StandardRequestHandler");
 
       // build the token-provider and service-metadata maps.
-      TokenProviders providers = this.delegate.getTokenProviders();
+      TokenProvidersType providers = this.delegate.getTokenProviders();
       if (providers != null)
       {
-         for (TokenProvider provider : providers.getTokenProvider())
+         for (TokenProviderType provider : providers.getTokenProvider())
          {
             try
             {
@@ -93,10 +93,10 @@
             }
          }
       }
-      ServiceProviders serviceProviders = this.delegate.getServiceProviders();
+      ServiceProvidersType serviceProviders = this.delegate.getServiceProviders();
       if(serviceProviders != null)
       {
-         for (ServiceProvider provider : serviceProviders.getServiceProvider())
+         for (ServiceProviderType provider : serviceProviders.getServiceProvider())
             this.spMetadata.put(provider.getEndpoint(), provider);
       }
    }
@@ -158,7 +158,7 @@
     */
    public SecurityTokenProvider getProviderForService(String serviceName)
    {
-      ServiceProvider provider = this.spMetadata.get(serviceName);
+      ServiceProviderType provider = this.spMetadata.get(serviceName);
       if (provider != null)
       {
          return this.tokenProviders.get(provider.getTokenType());
@@ -183,7 +183,7 @@
     */
    public String getTokenTypeForService(String serviceName)
    {
-      ServiceProvider provider = this.spMetadata.get(serviceName);
+      ServiceProviderType provider = this.spMetadata.get(serviceName);
       if (provider != null)
          return provider.getTokenType();
       return null;

Modified:
identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd	2009-04-06
17:59:41 UTC (rev 428)
@@ -153,4 +153,69 @@
     		<element name="KeySize" type="int"></element>
     	</sequence>
     </complexType>
+    
+    <!-- Security Token Service Elements -->
+    
+    <complexType name="STSType">
+		<sequence>
+			<element name="STSName" default="JBossSTS"
type="string" minOccurs="0"/>
+			<element name="TokenTimeout" default="3600"
type="int" minOccurs="0"/>
+			<element name="EncryptToken" default="false"
type="boolean" minOccurs="0"/>
+    		<element name="KeyProvider" type="tns:KeyProviderType"
+    			maxOccurs="1" minOccurs="0"/>
+			<element name="RequestHandler" type="string"
minOccurs="0"/>
+			<element name="TokenProviders" type="tns:TokenProvidersType"
minOccurs="0"/>
+			<element name="ServiceProviders"
type="tns:ServiceProvidersType" minOccurs="0"/>
+		</sequence>
+    </complexType>
+    
+    <complexType name="TokenProvidersType">
+    	<annotation>
+			<documentation>
+				The token providers specify the classes that handle the requests for each type of
security Token.
+				For example, a SAMLTokenProvider may be used to generate SAML token, while a
X509TokenProvider
+				may be used to generate X.509 tokens (certificates).
+			</documentation>
+		</annotation>
+		<sequence>
+			<element name="TokenProvider" type="tns:TokenProviderType"
minOccurs="1" maxOccurs="unbounded"/>
+		</sequence>
+    </complexType>
+
+	<complexType name="TokenProviderType">
+		<sequence>
+			<element name="ProviderClass" type="string"
minOccurs="1"/>
+			<element name="TokenType" type="string"
minOccurs="1"/>
+		</sequence>
+	</complexType>
+	
+	<complexType name="ServiceProvidersType">
+		<annotation>
+			<documentation>
+				The service providers specify the token type expected by each service provider.
+			</documentation>
+		</annotation>
+		<sequence>
+			<element name="ServiceProvider" type="tns:ServiceProviderType"
minOccurs="1" maxOccurs="unbounded"/>
+		</sequence>
+	</complexType>
+	    
+	<complexType name="ServiceProviderType">
+		<annotation>
+			<documentation>
+				The service provider type contains information about a specific service provider. In
particular,
+				it specifies the type of the token that must be issued for the provider and the alias
of the
+				provider's PKC in the truststore. This is used by the STS to locate the PKC when
encrypting the
+				generated token. 
+			</documentation>
+		</annotation>
+		<sequence>
+			<element name="TruststoreAlias" type="string"
minOccurs="0"/>
+			<element name="TokenType" type="string"
minOccurs="1"/>
+		</sequence>
+		<attribute name="endpoint" type="string"/>
+	</complexType>
+	
+    <element name="JBossSTS" type="tns:STSType"/>
+        
 </schema>
\ No newline at end of file

Deleted:
identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-sts.xsd
===================================================================
---
identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-sts.xsd	2009-04-06
17:57:14 UTC (rev 427)
+++
identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-sts.xsd	2009-04-06
17:59:41 UTC (rev 428)
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:sts="urn:jboss:identity-trust:config:1.0"
-	targetNamespace="urn:jboss:identity-trust:config:1.0" 
-	elementFormDefault="qualified">
-	
-	<xsd:element name="JBossSTSConfig">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element ref="sts:STSName" minOccurs="0"/>
-				<xsd:element ref="sts:TokenTimeout" minOccurs="0"/>
-				<xsd:element ref="sts:EncryptToken" minOccurs="0"/>
-				<xsd:element ref="sts:SecurityDomain" minOccurs="0"/>
-				<xsd:element ref="sts:Keystore" minOccurs="0"/>
-				<xsd:element ref="sts:Truststore" minOccurs="0"/>
-				<xsd:element ref="sts:RequestHandler" minOccurs="0"/>
-				<xsd:element ref="sts:TokenProviders" minOccurs="0"/>
-				<xsd:element ref="sts:ServiceProviders" minOccurs="0"/>
-			</xsd:sequence>	
-		</xsd:complexType>
-	</xsd:element> 
-	
-	<xsd:element name="STSName" default="JBossSTS"
type="xsd:string"/>
-
-	<xsd:element name="TokenTimeout" default="3600"
type="xsd:int"/>
-
-	<xsd:element name="EncryptToken" default="false"
type="xsd:boolean"/>
-
-	<!-- a security domain can be used to locate the key and trust stores -->
-	<xsd:element name="SecurityDomain" type="xsd:string"/>
-
-	<xsd:element name="Keystore">
-		<xsd:complexType>
-			<xsd:annotation>
-				<xsd:documentation>
-					The Keystore type contains information about the keystore that holds the STS PKC and
associated
-					private key. These are used to sign tokens, like SAML assertions.
-				</xsd:documentation>
-			</xsd:annotation>
-        	<xsd:attribute name="location" type="xsd:string"
use="required"/>
-        	<xsd:attribute name="password" type="xsd:string"
use="required"/>
-        	<xsd:attribute name="alias" type="xsd:string"
use="optional"/>
-		</xsd:complexType>        	
-	</xsd:element>
-
-	<xsd:element name="Truststore">
-		<xsd:complexType>
-			<xsd:annotation>
-				<xsd:documentation>
-					The Truststore type contains information about the truststore that holds the service
providers
-					PKCs (public key certificates). When tokens need to be encrypted, the service
provider's PKC
-					is used to perform the encryption. 
-				</xsd:documentation>
-			</xsd:annotation>
-        	<xsd:attribute name="location" type="xsd:string"
use="required"/>
-        	<xsd:attribute name="password" type="xsd:string"
use="required"/>
-		</xsd:complexType>        	
-	</xsd:element>
-
-	<xsd:element name="RequestHandler" type="xsd:string"/>
-
-	<xsd:element name="TokenProviders">
-		<xsd:complexType>
-			<xsd:annotation>
-				<xsd:documentation>
-					The token providers specify the classes that handle the requests for each type of
security Token.
-					For example, a SAMLTokenProvider may be used to generate SAML token, while a
X509TokenProvider
-					may be used to generate X.509 tokens (certificates).
-				</xsd:documentation>
-			</xsd:annotation>
-			<xsd:sequence>
-				<xsd:element ref="sts:TokenProvider" minOccurs="1"
maxOccurs="unbounded"/>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="TokenProvider">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element ref="sts:ProviderClass" minOccurs="1"/>
-				<xsd:element ref="sts:TokenType" minOccurs="1"/>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="ProviderClass" type="xsd:string"/>
-
-	<xsd:element name="TokenType" type="xsd:string"/>
-
-	<xsd:element name="ServiceProviders">
-		<xsd:complexType>
-			<xsd:annotation>
-				<xsd:documentation>
-					The service providers specify the token type expected by each service provider.
-				</xsd:documentation>
-			</xsd:annotation>
-			<xsd:sequence>
-				<xsd:element ref="sts:ServiceProvider" minOccurs="1"
maxOccurs="unbounded"/>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="ServiceProvider">
-		<xsd:complexType>
-			<xsd:annotation>
-				<xsd:documentation>
-					The service provider type contains information about a specific service provider. In
particular,
-					it specifies the type of the token that must be issued for the provider and the
alias of the
-					provider's PKC in the truststore. This is used by the STS to locate the PKC when
encrypting the
-					generated token. 
-				</xsd:documentation>
-			</xsd:annotation>
-			<xsd:sequence>
-				<xsd:element ref="sts:TruststoreAlias" minOccurs="0"/>
-				<xsd:element ref="sts:TokenType" minOccurs="1"/>
-			</xsd:sequence>
-			<xsd:attribute name="endpoint" type="xsd:string"/>
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="TruststoreAlias" type="xsd:string"/>
-</xsd:schema>
\ No newline at end of file

Modified: identity-federation/trunk/identity-bindings-jboss/.classpath
===================================================================
--- identity-federation/trunk/identity-bindings-jboss/.classpath	2009-04-06 17:57:14 UTC
(rev 427)
+++ identity-federation/trunk/identity-bindings-jboss/.classpath	2009-04-06 17:59:41 UTC
(rev 428)
@@ -1,13 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-bindings"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-fed-api"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-fed-core"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-fed-model"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-xmlsecmodel"/>
-	<classpathentry kind="var"
path="M2_REPO/org/jboss/security/jbosssx/2.0.3.SP1/jbosssx-2.0.3.SP1.jar"/>
-	<classpathentry kind="output" path="target-eclipse"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources"
excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/test/java"
output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources"
output="target/test-classes" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/annotations-api/6.0.18/annotations-api-6.0.18.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/catalina/6.0.18/catalina-6.0.18.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"
sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"
sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/>
+  <classpathentry kind="src" path="/jboss-identity-bindings"/>
+  <classpathentry kind="src" path="/jboss-identity-fed-api"/>
+  <classpathentry kind="src" path="/jboss-identity-fed-core"/>
+  <classpathentry kind="src"
path="/jboss-identity-fed-model"/>
+  <classpathentry kind="src"
path="/jboss-identity-xmlsec-model"/>
+  <classpathentry kind="var"
path="M2_REPO/org/jboss/security/jbosssx/2.0.2.SP6/jbosssx-2.0.2.SP6.jar"
sourcepath="M2_REPO/org/jboss/security/jbosssx/2.0.2.SP6/jbosssx-2.0.2.SP6-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar"
sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/juli/6.0.18/juli-6.0.18.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"
sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/servlet-api/6.0.18/servlet-api-6.0.18.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/>
+</classpath>
\ No newline at end of file

Modified: identity-federation/trunk/identity-fed-api/.classpath
===================================================================
--- identity-federation/trunk/identity-fed-api/.classpath	2009-04-06 17:57:14 UTC (rev
427)
+++ identity-federation/trunk/identity-fed-api/.classpath	2009-04-06 17:59:41 UTC (rev
428)
@@ -1,14 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-fed-core"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-fed-model"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-xmlsecmodel"/>
-	<classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/>
-	<classpathentry kind="output" path="target-eclipse"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources"
excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/test/java"
output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources"
output="target/test-classes" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"
sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"
sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/>
+  <classpathentry kind="src" path="/jboss-identity-fed-core"/>
+  <classpathentry kind="src"
path="/jboss-identity-fed-model"/>
+  <classpathentry kind="src"
path="/jboss-identity-xmlsec-model"/>
+  <classpathentry kind="var"
path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar"
sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"
sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/>
+</classpath>
\ No newline at end of file

Modified: identity-federation/trunk/identity-fed-core/.classpath
===================================================================
--- identity-federation/trunk/identity-fed-core/.classpath	2009-04-06 17:57:14 UTC (rev
427)
+++ identity-federation/trunk/identity-fed-core/.classpath	2009-04-06 17:59:41 UTC (rev
428)
@@ -1,13 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-fed-model"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-xmlsecmodel"/>
-	<classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
-	<classpathentry kind="output" path="target-eclipse"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources"
excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/test/java"
output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources"
output="target/test-classes" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"
sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"
sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>
+  <classpathentry kind="src"
path="/jboss-identity-fed-model"/>
+  <classpathentry kind="src"
path="/jboss-identity-xmlsec-model"/>
+  <classpathentry kind="var"
path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar"
sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"
sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/>
+</classpath>
\ No newline at end of file

Modified: identity-federation/trunk/identity-fed-model/.classpath
===================================================================
--- identity-federation/trunk/identity-fed-model/.classpath	2009-04-06 17:57:14 UTC (rev
427)
+++ identity-federation/trunk/identity-fed-model/.classpath	2009-04-06 17:59:41 UTC (rev
428)
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src"
path="/identity-xmlsecmodel"/>
-	<classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/org/jboss/security/jboss-xacml/2.0.3.CR4/jboss-xacml-2.0.3.CR4.jar"/>
-	<classpathentry kind="output" path="target-eclipse"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources"
excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/test/java"
output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources"
output="target/test-classes" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"
sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"
sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>
+  <classpathentry kind="src"
path="/jboss-identity-xmlsec-model"/>
+  <classpathentry kind="var"
path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar"
sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"
sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-xalan/serializer/2.7.0.patch01-brew/serializer-2.7.0.patch01-brew.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/>
+</classpath>
\ No newline at end of file

Modified: identity-federation/trunk/identity-xmlsecmodel/.classpath
===================================================================
--- identity-federation/trunk/identity-xmlsecmodel/.classpath	2009-04-06 17:57:14 UTC (rev
427)
+++ identity-federation/trunk/identity-xmlsecmodel/.classpath	2009-04-06 17:59:41 UTC (rev
428)
@@ -1,11 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-	<classpathentry kind="var"
path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/>
-	<classpathentry kind="output" path="target-eclipse"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources"
excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"
sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"
sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+  <classpathentry kind="var"
path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/>
+</classpath>
\ No newline at end of file


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

[jboss-identity-commits] JBoss Identity SVN: r428 - in identity-federation/trunk: identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config and 7 other directories.