JBoss Identity SVN: r1033 - in migration/idm/trunk/integration: deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2 and 5 other directories.
by jboss-identity-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-19 05:40:13 -0500 (Thu, 19 Nov 2009)
New Revision: 1033
Added:
migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml
migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml
migration/idm/trunk/integration/deployer/src/main/resources/picketlink-idm-hsqldb-ds.xml
migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.cfg.xml
migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.hibernate.cfg.xml
migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml
migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.picketlink.idm.cfg.xml
migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml
Removed:
migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml
migration/idm/trunk/integration/deployer/src/main/resources/META-INF/idm-deployer-jboss-beans.xml
migration/idm/trunk/integration/deployer/src/main/resources/jbidm-hsqldb-ds.xml
migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml
migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml
migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml
migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml
migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml
Modified:
migration/idm/trunk/integration/deployer/pom.xml
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java
migration/idm/trunk/integration/deployer/src/main/resources/META-INF/jboss-dependency.xml
migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd
migration/idm/trunk/integration/deployer/src/main/resources/idm-assembly.xml
Log:
* renaming the integration module, include the datasource, configuration file etc.
Modified: migration/idm/trunk/integration/deployer/pom.xml
===================================================================
--- migration/idm/trunk/integration/deployer/pom.xml 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/deployer/pom.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -127,7 +127,7 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>picketlink-idm-deployer</finalName>
+ <finalName>picketlink-idm.deployer</finalName>
<appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>src/main/resources/deployer-assembly.xml</descriptor>
Modified: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java 2009-11-19 10:40:13 UTC (rev 1033)
@@ -31,7 +31,7 @@
@XmlRegistry
public class ObjectFactory {
- private final static QName _JbossIdmDeployer_QNAME = new QName("urn:jboss:identity:idm:deployer:v1_0_beta", "jboss-idm-deployer");
+ private final static QName _JbossIdmDeployer_QNAME = new QName("urn:org:picketlink:idm:deployer:v1_0_CR1", "picketlink-idm-deployer");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.picketlink.idm.integration.jboss5.jaxb2
Modified: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java 2009-11-19 10:40:13 UTC (rev 1033)
@@ -5,5 +5,5 @@
// Generated on: 2009.05.28 at 11:27:34 PM CST
//
-(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:identity:idm:deployer:v1_0_beta", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:org:picketlink:idm:deployer:v1_0_CR1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.picketlink.idm.integration.jboss5.jaxb2;
Deleted: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd">
- <JNDIName>java:/IdentitySessionFactory</JNDIName>
- <idmConfigFile>jboss.idm.cfg.xml</idmConfigFile>
- <hibernateDeployer>
- <hibernateConfiguration>jboss.idm.hibernate.cfg.xml</hibernateConfiguration>
- <hibernateSessionFactoryJNDIName>java:/IDMHibernateSessionFactory</hibernateSessionFactoryJNDIName>
- </hibernateDeployer>
- <initializers>
- <datasource>java:/jbossidmDS</datasource>
- <sqlInitializer>
- <sqlFile>idm-sql/jboss.idm.@database@.create.sql</sqlFile>
- <exitSQL>select * from jbid_io</exitSQL>
- </sqlInitializer>
- <!-- hibernateInitializer>
- <doChecking>true</doChecking>
- </hibernateInitializer-->
- </initializers>
-</jboss-idm-deployer>
Copied: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml)
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd">
+ <JNDIName>java:/IdentitySessionFactory</JNDIName>
+ <idmConfigFile>picketlink.idm.cfg.xml</idmConfigFile>
+ <hibernateDeployer>
+ <hibernateConfiguration>picketlink.idm.hibernate.cfg.xml</hibernateConfiguration>
+ <hibernateSessionFactoryJNDIName>java:/IDMHibernateSessionFactory</hibernateSessionFactoryJNDIName>
+ </hibernateDeployer>
+ <initializers>
+ <datasource>java:/PicketLinkIDMDS</datasource>
+ <sqlInitializer>
+ <sqlFile>idm-sql/picketlink.idm.@database@.create.sql</sqlFile>
+ <exitSQL>select * from jbid_io</exitSQL>
+ </sqlInitializer>
+ <!-- hibernateInitializer>
+ <doChecking>true</doChecking>
+ </hibernateInitializer-->
+ </initializers>
+</jboss-idm-deployer>
Deleted: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/idm-deployer-jboss-beans.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/idm-deployer-jboss-beans.xml 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/idm-deployer-jboss-beans.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!--
- The JBoss IDM Meta Data Deployer
- -->
- <bean name="org.picketlink.idm:service=MetaDataDeployer"
- class="org.picketlink.idm.integration.jboss5.IDMConfigParsingDeployer">
-
- <property name="suffix">-jboss-idm.xml</property>
- <property name="allowMultipleFiles">true</property>
- </bean>
-
- <!--
- The actual IDM Deployer
- -->
- <bean name="org.picketlink.idm:service=Deployer"
- class="org.picketlink.idm.integration.jboss5.IDMDeployer">
- <property name="transactionManager">
- <inject bean="RealTransactionManager" option="callback"/>
- </property>
- </bean>
-
-</deployment>
\ No newline at end of file
Modified: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/jboss-dependency.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/jboss-dependency.xml 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/jboss-dependency.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -1,3 +1,3 @@
<dependency xmlns="urn:jboss:dependency:1.0">
- <item whenRequired="Real" dependentState="Installed">jboss.jca:service=DataSourceBinding,name=jbossidmDS</item>
+ <item whenRequired="Real" dependentState="Installed">jboss.jca:service=DataSourceBinding,name=PicketLinkIDMDS</item>
</dependency>
\ No newline at end of file
Copied: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/main/resources/META-INF/idm-deployer-jboss-beans.xml)
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!--
+ The JBoss IDM Meta Data Deployer
+ -->
+ <bean name="org.picketlink.idm:service=MetaDataDeployer"
+ class="org.picketlink.idm.integration.jboss5.IDMConfigParsingDeployer">
+
+ <property name="suffix">-jboss-idm.xml</property>
+ <property name="allowMultipleFiles">true</property>
+ </bean>
+
+ <!--
+ The actual IDM Deployer
+ -->
+ <bean name="org.picketlink.idm:service=Deployer"
+ class="org.picketlink.idm.integration.jboss5.IDMDeployer">
+ <property name="transactionManager">
+ <inject bean="RealTransactionManager" option="callback"/>
+ </property>
+ </bean>
+
+</deployment>
\ No newline at end of file
Modified: migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd 2009-11-19 10:40:13 UTC (rev 1033)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:jboss:identity:idm:deployer:v1_0_beta" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="jboss-idm-deployer" type="urn:jbossIDMDeployerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta">
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:org:picketlink:idm:deployer:v1_0_CR1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="picketlink-idm-deployer" type="urn:picketlinkIDMDeployerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1">
<xs:annotation>
- <xs:documentation><xs:schemaattributeFormDefault="unqualified"elementFormDefault="qualified"xmlns:xs="http://www.w3.org/2001/XMLSchema"targetNamespace="urn:jboss:identity:idm:deployer:v1_0_beta"xmlns="urn:jboss:identity:idm:deployer:v1_0_beta"xmlns:xml="http://www.w3.org/XML/1998/namespace"xmlns:wcc="urn:jboss:identity:idm:deployer:v1_0_beta"></xs:documentation>
+ <xs:documentation><xs:schemaattributeFormDefault="unqualified"elementFormDefault="qualified"xmlns:xs="http://www.w3.org/2001/XMLSchema"targetNamespace="urn:org:picketlink:idm:deployer:v1_0_CR1"xmlns="urn:org:picketlink:idm:deployer:v1_0_CR1"xmlns:xml="http://www.w3.org/XML/1998/namespace"xmlns:wcc="urn:org:picket:idm:deployer:v1_0_CR1"></xs:documentation>
</xs:annotation>
</xs:element>
- <xs:complexType name="jbossIDMDeployerType">
+ <xs:complexType name="picketlinkIDMDeployerType">
<xs:sequence>
<xs:element name="JNDIName" type="xs:string" />
<xs:element name="idmConfigFile" type="xs:string" />
- <xs:element name="hibernateDeployer" minOccurs="0" type="urn:hibernateDeployerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta"/>
- <xs:element name="initializers" minOccurs="0" type="urn:initializerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta"/>
- <xs:element name="options" minOccurs="0" type="urn:optionsType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta"/>
+ <xs:element name="hibernateDeployer" minOccurs="0" type="urn:hibernateDeployerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1"/>
+ <xs:element name="initializers" minOccurs="0" type="urn:initializerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1"/>
+ <xs:element name="options" minOccurs="0" type="urn:optionsType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1"/>
<xs:element name="depends" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
@@ -21,8 +21,8 @@
<xs:sequence>
<xs:element name="datasource" type="xs:string" />
<xs:choice>
- <xs:element name="sqlInitializer" type="urn:sqlInitializerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta" />
- <xs:element name="hibernateInitializer" type="urn:hibernateInitializerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta" />
+ <xs:element name="sqlInitializer" type="urn:sqlInitializerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1" />
+ <xs:element name="hibernateInitializer" type="urn:hibernateInitializerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1" />
</xs:choice>
</xs:sequence>
</xs:complexType>
@@ -43,7 +43,7 @@
<xs:complexType name="optionsType">
<xs:sequence>
- <xs:element name="option" type="urn:optionType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta" maxOccurs="unbounded" />
+ <xs:element name="option" type="urn:optionType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
Modified: migration/idm/trunk/integration/deployer/src/main/resources/idm-assembly.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/idm-assembly.xml 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/deployer/src/main/resources/idm-assembly.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -10,11 +10,10 @@
<directory>${project.build.outputDirectory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>jboss.idm.cfg.xml</include>
- <include>jboss.idm.hibernate.cfg.xml</include>
- <include>META-INF/default-jboss-idm.xml</include>
+ <include>picketlink.idm.cfg.xml</include>
+ <include>picketlink.idm.hibernate.cfg.xml</include>
+ <include>META-INF/default-picketlink-idm.xml</include>
<include>META-INF/jboss-dependency.xml</include>
- <include>setupdata.txt</include>
</includes>
</fileSet>
</fileSets>
Deleted: migration/idm/trunk/integration/deployer/src/main/resources/jbidm-hsqldb-ds.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/jbidm-hsqldb-ds.xml 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/deployer/src/main/resources/jbidm-hsqldb-ds.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
-
- <local-tx-datasource>
- <jndi-name>jbossidmDS</jndi-name>
-
- <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbossidm</connection-url>
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
- <user-name>sa</user-name>
- <password></password>
-
- <!-- connection pool parameters -->
- <min-pool-size>1</min-pool-size>
- <max-pool-size>5</max-pool-size>
-
- <!-- disable idle connection removal, hsqldb does not reap threads on closed connections -->
- <idle-timeout-minutes>0</idle-timeout-minutes>
- <!-- check all statements are closed when the connection is returned to the pool -->
- <track-statements />
- <!-- hsqldb benefits from prepared statement caching -->
- <prepared-statement-cache-size>32</prepared-statement-cache-size>
-
- <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml -->
- <metadata>
- <type-mapping>Hypersonic SQL</type-mapping>
- </metadata>
-
- <!-- ensure the datasource is not initialized before the database itself -->
- <depends>jboss:service=Hypersonic,database=jbossidm</depends>
- </local-tx-datasource>
-
- <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbossidm">
- <attribute name="Database">jbossidm</attribute>
- <attribute name="InProcessMode">true</attribute>
- </mbean>
-
-</datasources>
\ No newline at end of file
Deleted: migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd">
- <realms>
- <realm>
- <id>realm://JBossIdentity</id>
- <repository-id-ref>JBoss_Identity_Repository</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- </realm>
- </realms>
- <repositories>
- <repository>
- <id>JBoss_Identity_Repository</id>
- <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
- <external-config/>
- <default-identity-store-id>Identity_DB_Store</default-identity-store-id>
- <default-attribute-store-id>Identity_DB_Store</default-attribute-store-id>
- </repository>
- </repositories>
- <stores>
- <attribute-stores/>
- <identity-stores>
- <identity-store>
- <id>Identity_DB_Store</id>
- <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class>
- <external-config/>
- <supported-relationship-types>
- <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type>
- <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type>
- </supported-relationship-types>
- <supported-identity-object-types>
- <identity-object-type>
- <name>USER</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>GROUP</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials>
- <credential-type>PASSWORD</credential-type>
- </credentials>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>ORGANIZATION</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>USER</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>USER</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>GROUP</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>GROUP</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>USER</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>USER</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>GROUP</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- </supported-identity-object-types>
- <options>
- <option>
- <name>hibernateSessionFactoryJNDIName</name>
- <value>java:/IDMHibernateSessionFactory</value>
- </option>
- <option>
- <name>addHibernateMappings</name>
- <value>false</value>
- </option>
- <option>
- <name>populateRelationshipTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>populateIdentityObjectTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- <option>
- <name>allowNotDefinedIdentityObjectTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>manageTransactionDuringBootstrap</name>
- <value>false</value>
- </option>
- <option>
- <name>isRealmAware</name>
- <value>true</value>
- </option>
- </options>
- </identity-store>
- </identity-stores>
- </stores>
-</jboss-identity>
Deleted: migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -1,64 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-<hibernate-configuration>
- <session-factory>
-
- <property name="show_sql">false</property>
- <property name="cache.use_second_level_cache">true</property>
- <property name="cache.use_query_cache">true</property>
-
- <property name="current_session_context_class">thread</property>
-
- <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-
- <!--<property name="connection.datasource"></property>-->
-
- <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbossidm</property>
- <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
- <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
- <property name="hibernate.hbm2ddl.auto">create-drop</property>
- <property name="hibernate.connection.username">sa</property>
- <property name="hibernate.connection.password"></property>
-
- <!-- Mapping classes -->
- <!-- all nessesary mappings are added programatically to the configuration in the store-->
- <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
- <!--<mapping resource="mappings/HibernateRealm.hbm.xml"/>-->
- <!--<mapping resource="mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml"/>-->
- <!--<mapping resource="mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml"/>-->
- <!--<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>-->
- <!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>-->
- <!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>-->
- <!--<mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>-->
- <!--<mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>-->
- <!--<mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>-->
- <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>-->
- <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>-->
-
- </session-factory>
-</hibernate-configuration>
\ No newline at end of file
Copied: migration/idm/trunk/integration/deployer/src/main/resources/picketlink-idm-hsqldb-ds.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/main/resources/jbidm-hsqldb-ds.xml)
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/picketlink-idm-hsqldb-ds.xml (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/resources/picketlink-idm-hsqldb-ds.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources>
+
+ <local-tx-datasource>
+ <jndi-name>jbossidmDS</jndi-name>
+
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbossidm</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+
+ <!-- connection pool parameters -->
+ <min-pool-size>1</min-pool-size>
+ <max-pool-size>5</max-pool-size>
+
+ <!-- disable idle connection removal, hsqldb does not reap threads on closed connections -->
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+ <!-- check all statements are closed when the connection is returned to the pool -->
+ <track-statements />
+ <!-- hsqldb benefits from prepared statement caching -->
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+
+ <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml -->
+ <metadata>
+ <type-mapping>Hypersonic SQL</type-mapping>
+ </metadata>
+
+ <!-- ensure the datasource is not initialized before the database itself -->
+ <depends>jboss:service=Hypersonic,database=jbossidm</depends>
+ </local-tx-datasource>
+
+ <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbossidm">
+ <attribute name="Database">jbossidm</attribute>
+ <attribute name="InProcessMode">true</attribute>
+ </mbean>
+
+</datasources>
\ No newline at end of file
Copied: migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.cfg.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml)
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.cfg.xml (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd">
+ <realms>
+ <realm>
+ <id>realm://JBossIdentity</id>
+ <repository-id-ref>JBoss_Identity_Repository</repository-id-ref>
+ <identity-type-mappings>
+ <user-mapping>USER</user-mapping>
+ </identity-type-mappings>
+ </realm>
+ </realms>
+ <repositories>
+ <repository>
+ <id>JBoss_Identity_Repository</id>
+ <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
+ <external-config/>
+ <default-identity-store-id>Identity_DB_Store</default-identity-store-id>
+ <default-attribute-store-id>Identity_DB_Store</default-attribute-store-id>
+ </repository>
+ </repositories>
+ <stores>
+ <attribute-stores/>
+ <identity-stores>
+ <identity-store>
+ <id>Identity_DB_Store</id>
+ <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class>
+ <external-config/>
+ <supported-relationship-types>
+ <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type>
+ <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type>
+ </supported-relationship-types>
+ <supported-identity-object-types>
+ <identity-object-type>
+ <name>USER</name>
+ <relationships>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
+ <identity-object-type-ref>GROUP</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials>
+ <credential-type>PASSWORD</credential-type>
+ </credentials>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>ORGANIZATION</name>
+ <relationships>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>GROUP</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>GROUP</name>
+ <relationships>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>GROUP</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ </supported-identity-object-types>
+ <options>
+ <option>
+ <name>hibernateSessionFactoryJNDIName</name>
+ <value>java:/IDMHibernateSessionFactory</value>
+ </option>
+ <option>
+ <name>addHibernateMappings</name>
+ <value>false</value>
+ </option>
+ <option>
+ <name>populateRelationshipTypes</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>populateIdentityObjectTypes</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowNotDefinedAttributes</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowNotDefinedIdentityObjectTypes</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>manageTransactionDuringBootstrap</name>
+ <value>false</value>
+ </option>
+ <option>
+ <name>isRealmAware</name>
+ <value>true</value>
+ </option>
+ </options>
+ </identity-store>
+ </identity-stores>
+ </stores>
+</jboss-identity>
Copied: migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.hibernate.cfg.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml)
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.hibernate.cfg.xml (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.hibernate.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE hibernate-configuration PUBLIC
+ "-//Hibernate/Hibernate Configuration DTD//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+ <session-factory>
+
+ <property name="show_sql">false</property>
+ <property name="cache.use_second_level_cache">true</property>
+ <property name="cache.use_query_cache">true</property>
+
+ <property name="current_session_context_class">thread</property>
+
+ <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+
+ <!--<property name="connection.datasource"></property>-->
+
+ <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbossidm</property>
+ <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
+ <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
+ <property name="hibernate.hbm2ddl.auto">create-drop</property>
+ <property name="hibernate.connection.username">sa</property>
+ <property name="hibernate.connection.password"></property>
+
+ <!-- Mapping classes -->
+ <!-- all nessesary mappings are added programatically to the configuration in the store-->
+ <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration-->
+ <!--<mapping resource="mappings/HibernateRealm.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>-->
+ <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>-->
+
+ </session-factory>
+</hibernate-configuration>
\ No newline at end of file
Deleted: migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd">
- <JNDIName>java:/jbpmIdentitySessionFactory</JNDIName>
- <idmConfigFile>jbpm.idm.cfg.xml</idmConfigFile>
-</jboss-idm-deployer>
Copied: migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml)
===================================================================
--- migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml (rev 0)
+++ migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd">
+ <JNDIName>java:/jbpmIdentitySessionFactory</JNDIName>
+ <idmConfigFile>jbpm.idm.cfg.xml</idmConfigFile>
+</jboss-idm-deployer>
Deleted: migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd">
- <realms>
- <realm>
- <id>realm://jbpmIdentity</id>
- <repository-id-ref>jbpm_Identity_Repository</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- </realm>
- </realms>
- <repositories>
- <repository>
- <id>jbpm_Identity_Repository</id>
- <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
- <external-config/>
- <default-identity-store-id>jbpm_Identity_DB_Store</default-identity-store-id>
- <default-attribute-store-id>jbpm_Identity_DB_Store</default-attribute-store-id>
- </repository>
- </repositories>
- <stores>
- <attribute-stores/>
- <identity-stores>
- <identity-store>
- <id>jbpm_Identity_DB_Store</id>
- <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class>
- <external-config/>
- <supported-relationship-types>
- <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type>
- <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type>
- </supported-relationship-types>
- <supported-identity-object-types>
- <identity-object-type>
- <name>USER</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>unit</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials>
- <credential-type>PASSWORD</credential-type>
- </credentials>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>unit</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>USER</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>USER</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>unit</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- </supported-identity-object-types>
- <options>
- <option>
- <name>hibernateSessionFactoryJNDIName</name>
- <value>java:/IDMHibernateSessionFactory</value>
- </option>
- <option>
- <name>populateRelationshipTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>populateIdentityObjectTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- <option>
- <name>isRealmAware</name>
- <value>true</value>
- </option>
- </options>
- </identity-store>
- </identity-stores>
- </stores>
-</jboss-identity>
Copied: migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.picketlink.idm.cfg.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml)
===================================================================
--- migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.picketlink.idm.cfg.xml (rev 0)
+++ migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.picketlink.idm.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd">
+ <realms>
+ <realm>
+ <id>realm://jbpmIdentity</id>
+ <repository-id-ref>jbpm_Identity_Repository</repository-id-ref>
+ <identity-type-mappings>
+ <user-mapping>USER</user-mapping>
+ </identity-type-mappings>
+ </realm>
+ </realms>
+ <repositories>
+ <repository>
+ <id>jbpm_Identity_Repository</id>
+ <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
+ <external-config/>
+ <default-identity-store-id>jbpm_Identity_DB_Store</default-identity-store-id>
+ <default-attribute-store-id>jbpm_Identity_DB_Store</default-attribute-store-id>
+ </repository>
+ </repositories>
+ <stores>
+ <attribute-stores/>
+ <identity-stores>
+ <identity-store>
+ <id>jbpm_Identity_DB_Store</id>
+ <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class>
+ <external-config/>
+ <supported-relationship-types>
+ <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type>
+ <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type>
+ </supported-relationship-types>
+ <supported-identity-object-types>
+ <identity-object-type>
+ <name>USER</name>
+ <relationships>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
+ <identity-object-type-ref>unit</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials>
+ <credential-type>PASSWORD</credential-type>
+ </credentials>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>unit</name>
+ <relationships>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>unit</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ </supported-identity-object-types>
+ <options>
+ <option>
+ <name>hibernateSessionFactoryJNDIName</name>
+ <value>java:/IDMHibernateSessionFactory</value>
+ </option>
+ <option>
+ <name>populateRelationshipTypes</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>populateIdentityObjectTypes</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowNotDefinedAttributes</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>isRealmAware</name>
+ <value>true</value>
+ </option>
+ </options>
+ </identity-store>
+ </identity-stores>
+ </stores>
+</jboss-identity>
Deleted: migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml
===================================================================
--- migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml 2009-11-19 04:40:56 UTC (rev 1032)
+++ migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!--
- IDM Service
- -->
- <bean name="jboss.identity.IDMService"
- class="org.picketlink.idm.integration.jboss5.IDMService">
- <constructor>
- <parameter>jboss.idm.cfg.xml</parameter>
- </constructor>
- <property name="idmSessionFactoryJNDI">java:/IdentitySessionFactory</property>
- <property name="SQLScript">idm-sql/jboss.idm.hsql.create.sql</property>
- <property name="datasource">java:jbossidmDS</property>
- <property name="exitSQL">select * from jbid_io</property>
- <depends>jboss.jca:service=DataSourceBinding,name=jbossidmDS</depends>
- </bean>
-
-</deployment>
\ No newline at end of file
Copied: migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml (from rev 1031, migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml)
===================================================================
--- migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml (rev 0)
+++ migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml 2009-11-19 10:40:13 UTC (rev 1033)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!--
+ IDM Service
+ -->
+ <bean name="jboss.identity.IDMService"
+ class="org.picketlink.idm.integration.jboss5.IDMService">
+ <constructor>
+ <parameter>picketlink.idm.cfg.xml</parameter>
+ </constructor>
+ <property name="idmSessionFactoryJNDI">java:/IdentitySessionFactory</property>
+ <property name="SQLScript">idm-sql/picketlink.idm.hsql.create.sql</property>
+ <property name="datasource">java:idmDS</property>
+ <property name="exitSQL">select * from jbid_io</property>
+ <depends>jboss.jca:service=DataSourceBinding,name=jbossidmDS</depends>
+ </bean>
+
+</deployment>
\ No newline at end of file
16 years, 6 months
JBoss Identity SVN: r1032 - in migration/picketlink/federation/trunk: picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/interfaces and 1 other directories.
by jboss-identity-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-11-18 23:40:56 -0500 (Wed, 18 Nov 2009)
New Revision: 1032
Added:
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/interfaces/SAML2HandlerErrorCodes.java
Modified:
migration/picketlink/federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
migration/picketlink/federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2SignatureValidationHandler.java
Log:
start errors
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-11-18 21:51:10 UTC (rev 1031)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-11-19 04:40:56 UTC (rev 1032)
@@ -641,14 +641,7 @@
if(trace) log.trace(e);
}
}
- }/*
- else
- {
- //User Principal is null
-
- //TODO: Send a formal unauthorized message
- throw new ServletException("Unauthorized");
- }*/
+ }
}
protected void sendErrorResponseToSP(String referrer, Response response, String relayState,
Added: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/interfaces/SAML2HandlerErrorCodes.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/interfaces/SAML2HandlerErrorCodes.java (rev 0)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/interfaces/SAML2HandlerErrorCodes.java 2009-11-19 04:40:56 UTC (rev 1032)
@@ -0,0 +1,32 @@
+/*
+ * 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.core.saml.v2.interfaces;
+
+/**
+ * Error Codes for SAML2 Handlers
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Nov 18, 2009
+ */
+public interface SAML2HandlerErrorCodes
+{
+ int SIGNATURE_INVALID = 100;
+}
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2SignatureValidationHandler.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2SignatureValidationHandler.java 2009-11-18 21:51:10 UTC (rev 1031)
+++ migration/picketlink/federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2SignatureValidationHandler.java 2009-11-19 04:40:56 UTC (rev 1032)
@@ -26,6 +26,7 @@
import org.apache.log4j.Logger;
import org.picketlink.identity.federation.core.exceptions.ConfigurationException;
import org.picketlink.identity.federation.core.exceptions.ProcessingException;
+import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerErrorCodes;
import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest;
import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse;
import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;
@@ -59,7 +60,16 @@
}
}
PublicKey publicKey = (PublicKey) request.getOptions().get(GeneralConstants.SENDER_PUBLIC_KEY);
- this.validateSender(signedDocument, publicKey);
+ try
+ {
+ this.validateSender(signedDocument, publicKey);
+ }
+ catch(ProcessingException pe)
+ {
+ response.setError(SAML2HandlerErrorCodes.SIGNATURE_INVALID,
+ "Signature Validation Failed");
+ throw pe;
+ }
}
@Override
16 years, 6 months
JBoss Identity SVN: r1031 - in migration/picketlink/federation/trunk/picketlink-webapps: employee-post-sig/src/main/webapp/WEB-INF and 4 other directories.
by jboss-identity-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-11-18 16:51:10 -0500 (Wed, 18 Nov 2009)
New Revision: 1031
Modified:
migration/picketlink/federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/web.xml
migration/picketlink/federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/web.xml
migration/picketlink/federation/trunk/picketlink-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/web.xml
migration/picketlink/federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/web.xml
migration/picketlink/federation/trunk/picketlink-webapps/openid-consumer/resources/WEB-INF/web.xml
migration/picketlink/federation/trunk/picketlink-webapps/openid-provider/resources/WEB-INF/web.xml
Log:
changes
Modified: migration/picketlink/federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/web.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/web.xml 2009-11-18 21:34:30 UTC (rev 1030)
+++ migration/picketlink/federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/web.xml 2009-11-18 21:51:10 UTC (rev 1031)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
- <display-name>Test Employee Application</display-name>
+ <display-name>PicketLink Employee Application</display-name>
<description>
Just a Test SP
</description>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/web.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/web.xml 2009-11-18 21:34:30 UTC (rev 1030)
+++ migration/picketlink/federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/web.xml 2009-11-18 21:51:10 UTC (rev 1031)
@@ -4,9 +4,9 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
- <display-name>Fedbridge Test SALES Application</display-name>
+ <display-name>PicketLink Test SALES Application</display-name>
<description>
- Just a Test SP for Fedbridge Project
+ Just a Test SP for PicketLink Project
</description>
<!-- Define a Security Constraint on this Application -->
Modified: migration/picketlink/federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/web.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/web.xml 2009-11-18 21:34:30 UTC (rev 1030)
+++ migration/picketlink/federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/web.xml 2009-11-18 21:51:10 UTC (rev 1031)
@@ -3,8 +3,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
<display-name>IDP</display-name>
- <description> IDP Web Application for the PicketLink project
- </description>
+ <description> IDP Web Application for the PicketLink project</description>
<!--
Define a security constraint that gives unlimted access to images
-->
Modified: migration/picketlink/federation/trunk/picketlink-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/web.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/web.xml 2009-11-18 21:34:30 UTC (rev 1030)
+++ migration/picketlink/federation/trunk/picketlink-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/web.xml 2009-11-18 21:51:10 UTC (rev 1031)
@@ -3,8 +3,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
<display-name>IDP</display-name>
- <description> IDP Web Application for the PicketLink project
- </description>
+ <description> IDP Web Application for the PicketLink project</description>
<!--
Define a security constraint that gives unlimted access to images
-->
Modified: migration/picketlink/federation/trunk/picketlink-webapps/openid-consumer/resources/WEB-INF/web.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/openid-consumer/resources/WEB-INF/web.xml 2009-11-18 21:34:30 UTC (rev 1030)
+++ migration/picketlink/federation/trunk/picketlink-webapps/openid-consumer/resources/WEB-INF/web.xml 2009-11-18 21:51:10 UTC (rev 1031)
@@ -13,7 +13,7 @@
<servlet-class>org.picketlink.identity.federation.web.servlets.OpenIDConsumerServlet</servlet-class>
</servlet>
<servlet-mapping>
+ <servlet-name>ConsumerServlet</servlet-name>
<url-pattern>/consumer/*</url-pattern>
- <servlet-name>ConsumerServlet</servlet-name>
</servlet-mapping>
</web-app>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/openid-provider/resources/WEB-INF/web.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/openid-provider/resources/WEB-INF/web.xml 2009-11-18 21:34:30 UTC (rev 1030)
+++ migration/picketlink/federation/trunk/picketlink-webapps/openid-provider/resources/WEB-INF/web.xml 2009-11-18 21:51:10 UTC (rev 1031)
@@ -15,8 +15,8 @@
</servlet>
<servlet-mapping>
+ <servlet-name>ProviderServlet</servlet-name>
<url-pattern>/provider/*</url-pattern>
- <servlet-name>ProviderServlet</servlet-name>
</servlet-mapping>
<security-constraint>
16 years, 6 months
JBoss Identity SVN: r1030 - in migration/picketlink/federation/trunk: picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF and 1 other directories.
by jboss-identity-commits@lists.jboss.org
Author: sguilhen(a)redhat.com
Date: 2009-11-18 16:34:30 -0500 (Wed, 18 Nov 2009)
New Revision: 1030
Modified:
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java
migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/web.xml
migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl
Log:
Updated STS targetNamespace
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java 2009-11-18 21:26:59 UTC (rev 1029)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java 2009-11-18 21:34:30 UTC (rev 1030)
@@ -55,7 +55,7 @@
* @author <a href="mailto:sguilhen@redhat.com">Stefan Guilhen</a>
*/
@WebServiceProvider(serviceName = "PicketLinkSTS", portName = "PicketLinkSTSPort",
- targetNamespace = "http://org.picketlink.trust/sts",
+ targetNamespace = "urn:picketlink:identity-federation:sts",
wsdlLocation = "WEB-INF/wsdl/PicketLinkSTS.wsdl")
@ServiceMode(value = Service.Mode.PAYLOAD)
public class PicketLinkSTS implements SecurityTokenService
@@ -200,7 +200,7 @@
URL configurationFile = SecurityActions.getContextClassLoader().getResource(STS_CONFIG_FILE);
if (configurationFile == null)
{
- logger.warn("jboss-sts.xml configuration file not found. Using default configuration values");
+ logger.warn("picketlink-sts.xml configuration file not found. Using default configuration values");
return new PicketLinkSTSConfiguration();
}
@@ -212,7 +212,7 @@
STSType stsConfig = element.getValue();
STSConfiguration configuration = new PicketLinkSTSConfiguration(stsConfig);
if(logger.isInfoEnabled())
- logger.info("jboss-sts.xml configuration file loaded");
+ logger.info("picketlink-sts.xml configuration file loaded");
return configuration;
}
catch (Exception e)
Modified: migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/web.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/web.xml 2009-11-18 21:26:59 UTC (rev 1029)
+++ migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/web.xml 2009-11-18 21:34:30 UTC (rev 1030)
@@ -5,11 +5,11 @@
<web-app>
<servlet>
- <servlet-name>JBossSTS</servlet-name>
- <servlet-class>org.picketlink.identity.federation.core.wstrust.JBossSTS</servlet-class>
+ <servlet-name>PicketLinkSTS</servlet-name>
+ <servlet-class>org.picketlink.identity.federation.core.wstrust.PicketLinkSTS</servlet-class>
</servlet>
<servlet-mapping>
- <servlet-name>JBossSTS</servlet-name>
+ <servlet-name>PicketLinkSTS</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>
@@ -27,7 +27,7 @@
<login-config>
<auth-method>BASIC</auth-method>
- <realm-name>JBossSTSRealm</realm-name>
+ <realm-name>PicketLinkSTSRealm</realm-name>
</login-config>
<security-role>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl 2009-11-18 21:26:59 UTC (rev 1029)
+++ migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl 2009-11-18 21:34:30 UTC (rev 1030)
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
-<wsdl:definitions name="JBossSTS" targetNamespace="http://org.jboss.identity.trust/sts"
- xmlns:tns="http://org.jboss.identity.trust/sts"
+<wsdl:definitions name="JBossSTS" targetNamespace="urn:picketlink:identity-federation:sts"
+ xmlns:tns="urn:picketlink:identity-federation:sts"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:wsap10="http://www.w3.org/2006/05/addressing/wsdl"
xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/">
<wsdl:types>
- <xs:schema targetNamespace="http://org.jboss.identity.trust/sts" xmlns:tns="http://org.jboss.identity.trust/sts" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:schema version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:complexType name="MessageBody">
<xs:sequence>
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any"/>
@@ -38,9 +38,9 @@
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
- <wsdl:service name="JBossSTS">
- <wsdl:port name="JBossSTSPort" binding="tns:STSBinding">
- <soap12:address location="http://localhost:8080/jboss-sts"/>
+ <wsdl:service name="PicketLinkSTS">
+ <wsdl:port name="PicketLinkSTSPort" binding="tns:STSBinding">
+ <soap12:address location="http://localhost:8080/picketlink-sts"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
16 years, 6 months
JBoss Identity SVN: r1029 - migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust.
by jboss-identity-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-11-18 16:26:59 -0500 (Wed, 18 Nov 2009)
New Revision: 1029
Modified:
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java
Log:
migration
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java 2009-11-18 21:20:00 UTC (rev 1028)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java 2009-11-18 21:26:59 UTC (rev 1029)
@@ -200,7 +200,7 @@
JAXBElement<?> content = subject.getContent().get(0);
assertEquals("Unexpected content type", NameIDType.class, content.getDeclaredType());
NameIDType nameID = (NameIDType) content.getValue();
- assertEquals("Unexpected name id qualifier", "urn:jboss:identity-federation", nameID.getNameQualifier());
+ assertEquals("Unexpected name id qualifier", "urn:picketlink:identity-federation", nameID.getNameQualifier());
assertEquals("Unexpected name id", "sguilhen", nameID.getValue());
content = subject.getContent().get(1);
assertEquals("Unexpected content type", SubjectConfirmationType.class, content.getDeclaredType());
16 years, 6 months
JBoss Identity SVN: r1028 - in migration/picketlink/federation/trunk: picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF and 33 other directories.
by jboss-identity-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-11-18 16:20:00 -0500 (Wed, 18 Nov 2009)
New Revision: 1028
Modified:
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/config/test-metadata-config-1.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/idp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/wstrust/WSTrustClientUnitTestCase.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ObjectFactory.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/STSType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTSConfiguration.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/STSClientConfig.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/handlers/STSSaml20Handler.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/STSClientConfigUnitTestCase.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/STSClientUnitTestCase.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-1.xml
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-2.xml
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-3.xml
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-4.xml
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-5.xml
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-metadata-config-1.xml
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/picketlink-sts.xml
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/wstrust/assertion-expected.xml
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/wstrust/assertion.xml
migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/wstrust/sts-client.properties
migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/idp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-webapps/idp-standalone/src/main/webapp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-webapps/idp-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-webapps/idp/src/main/webapp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-webapps/idp/src/main/webapp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-webapps/metadata/resources/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-webapps/pdp/src/main/webapp/WEB-INF/classes/policyConfig.xml
migration/picketlink/federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-webapps/sales-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-webapps/sales-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-webapps/sales-standalone/src/main/webapp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-webapps/sales-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml
migration/picketlink/federation/trunk/picketlink-webapps/sales/src/main/webapp/WEB-INF/picketlink-handlers.xml
migration/picketlink/federation/trunk/picketlink-webapps/sales/src/main/webapp/WEB-INF/picketlink-idfed.xml
Log:
migration
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/config/test-metadata-config-1.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/config/test-metadata-config-1.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/config/test-metadata-config-1.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
AssertionValidity="20000"
RoleGenerator="somefqn"
Encrypt="true">
@@ -15,4 +15,4 @@
<MetaDataProvider ClassName="org.jboss.test.somefqn">
<Option Key="FileName" Value="myfile"/>
</MetaDataProvider>
-</JBossIDP>
\ No newline at end of file
+</PicketLinkIDP>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.RolesGenerationHandler"/>
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
AttributeManager=""
RoleGenerator="org.picketlink.identity.federation.core.impl.EmptyRoleGenerator">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
@@ -6,4 +6,4 @@
<Domains>localhost,jboss.com,jboss.org</Domains>
</Trust>
-</JBossIDP>
+</PicketLinkIDP>
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,3 +1,3 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
</Handlers>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,6 +1,6 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0"
AttributeManager="">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
<ServiceURL>http://localhost:8080/employee/</ServiceURL>
-</JBossSP>
\ No newline at end of file
+</PicketLinkSP>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,3 +1,3 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
</Handlers>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,6 +1,6 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0"
AttributeManager="">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
<ServiceURL>http://localhost:8080/sales/</ServiceURL>
-</JBossSP>
\ No newline at end of file
+</PicketLinkSP>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/idp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/idp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/idp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,8 +1,8 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
AttributeManager="">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
<Trust>
<Domains>localhost,jboss.com,jboss.org</Domains>
</Trust>
-</JBossIDP>
+</PicketLinkIDP>
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,6 +1,6 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0"
AttributeManager="">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
<ServiceURL>http://localhost:8080/employee/</ServiceURL>
-</JBossSP>
\ No newline at end of file
+</PicketLinkSP>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
AttributeManager=""
RoleGenerator="org.picketlink.identity.federation.core.impl.EmptyRoleGenerator">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
@@ -6,4 +6,4 @@
<Domains>localhost,jboss.com,jboss.org</Domains>
</Trust>
-</JBossIDP>
+</PicketLinkIDP>
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
</Handlers>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,6 +1,6 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0"
AttributeManager="">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
<ServiceURL>http://localhost:8080/employee/</ServiceURL>
-</JBossSP>
\ No newline at end of file
+</PicketLinkSP>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
</Handlers>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,6 +1,6 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0"
AttributeManager="">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
<ServiceURL>http://localhost:8080/sales/</ServiceURL>
-</JBossSP>
\ No newline at end of file
+</PicketLinkSP>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/wstrust/WSTrustClientUnitTestCase.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/wstrust/WSTrustClientUnitTestCase.java 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/wstrust/WSTrustClientUnitTestCase.java 2009-11-18 21:20:00 UTC (rev 1028)
@@ -187,9 +187,9 @@
if(usetest == false)
return;
- String serviceName = "JBossSTS";
- String portName = "JBossSTSPort";
- String endpointAddress = "http://localhost:8080/jboss-sts/JBossSTS";
+ String serviceName = "PicketLinkSTS";
+ String portName = "PicketLinkSTSPort";
+ String endpointAddress = "http://localhost:8080/jboss-sts/PicketLinkSTS";
WSTrustClient client = new WSTrustClient(serviceName, portName, endpointAddress, new SecurityInfo("admin", "admin") );
Element token = client.issueToken(SAMLUtil.SAML2_TOKEN_TYPE);
assertTrue("Token is valid" , client.validateToken(token));
@@ -203,9 +203,9 @@
{
// JBoss STS target information.
String targetNS = "http://org.picketlink.trust/sts/";
- QName serviceName = new QName(targetNS, "JBossSTS");
- QName portName = new QName(targetNS, "JBossSTSPort");
- URL endpointAddress = new URL("http://localhost:8080/jboss-sts/JBossSTS");
+ QName serviceName = new QName(targetNS, "PicketLinkSTS");
+ QName portName = new QName(targetNS, "PicketLinkSTSPort");
+ URL endpointAddress = new URL("http://localhost:8080/jboss-sts/PicketLinkSTS");
// URL securityConfigURL = new File("jboss-wsse-client.xml").toURI().toURL();
Service service = Service.create(serviceName);
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ObjectFactory.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ObjectFactory.java 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ObjectFactory.java 2009-11-18 21:20:00 UTC (rev 1028)
@@ -31,9 +31,9 @@
@XmlRegistry
public class ObjectFactory {
- private final static QName _picketlinkIDP_QNAME = new QName("urn:picketlink:identity-federation:config:1.0", "picketlinkIDP");
- private final static QName _picketlinkSTS_QNAME = new QName("urn:picketlink:identity-federation:config:1.0", "picketlinkSTS");
- private final static QName _picketlinkSP_QNAME = new QName("urn:picketlink:identity-federation:config:1.0", "picketlinkSP");
+ private final static QName _picketlinkIDP_QNAME = new QName("urn:picketlink:identity-federation:config:1.0", "PicketLinkIDP");
+ private final static QName _PicketLinkSTS_QNAME = new QName("urn:picketlink:identity-federation:config:1.0", "PicketLinkSTS");
+ private final static QName _picketlinkSP_QNAME = new QName("urn:picketlink:identity-federation:config:1.0", "PicketLinkSP");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: picketlink.identity_federation.config._1
@@ -174,7 +174,7 @@
* Create an instance of {@link JAXBElement }{@code <}{@link IDPType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "urn:picketlink:identity-federation:config:1.0", name = "picketlinkIDP")
+ @XmlElementDecl(namespace = "urn:picketlink:identity-federation:config:1.0", name = "PicketLinkIDP")
public JAXBElement<IDPType> createpicketlinkIDP(IDPType value) {
return new JAXBElement<IDPType>(_picketlinkIDP_QNAME, IDPType.class, null, value);
}
@@ -183,16 +183,16 @@
* Create an instance of {@link JAXBElement }{@code <}{@link STSType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "urn:picketlink:identity-federation:config:1.0", name = "picketlinkSTS")
- public JAXBElement<STSType> createpicketlinkSTS(STSType value) {
- return new JAXBElement<STSType>(_picketlinkSTS_QNAME, STSType.class, null, value);
+ @XmlElementDecl(namespace = "urn:picketlink:identity-federation:config:1.0", name = "PicketLinkSTS")
+ public JAXBElement<STSType> createPicketLinkSTS(STSType value) {
+ return new JAXBElement<STSType>(_PicketLinkSTS_QNAME, STSType.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link SPType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "urn:picketlink:identity-federation:config:1.0", name = "picketlinkSP")
+ @XmlElementDecl(namespace = "urn:picketlink:identity-federation:config:1.0", name = "PicketLinkSP")
public JAXBElement<SPType> createpicketlinkSP(SPType value) {
return new JAXBElement<SPType>(_picketlinkSP_QNAME, SPType.class, null, value);
}
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/STSType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/STSType.java 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/STSType.java 2009-11-18 21:20:00 UTC (rev 1028)
@@ -31,7 +31,7 @@
* <element name="TokenProviders" type="{urn:picketlink:identity-federation:config:1.0}TokenProvidersType" minOccurs="0"/>
* <element name="ServiceProviders" type="{urn:picketlink:identity-federation:config:1.0}ServiceProvidersType" minOccurs="0"/>
* </sequence>
- * <attribute name="STSName" type="{http://www.w3.org/2001/XMLSchema}string" default="picketlinkSTS" />
+ * <attribute name="STSName" type="{http://www.w3.org/2001/XMLSchema}string" default="PicketLinkSTS" />
* <attribute name="TokenTimeout" type="{http://www.w3.org/2001/XMLSchema}int" default="3600" />
* <attribute name="SignToken" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
* <attribute name="EncryptToken" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
@@ -201,7 +201,7 @@
*/
public String getSTSName() {
if (stsName == null) {
- return "picketlinkSTS";
+ return "PicketLinkSTS";
} else {
return stsName;
}
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTSConfiguration.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTSConfiguration.java 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTSConfiguration.java 2009-11-18 21:20:00 UTC (rev 1028)
@@ -63,7 +63,7 @@
/**
* <p>
- * Creates an instance of {@code JBossSTSConfiguration} with default configuration values.
+ * Creates an instance of {@code PicketLinkSTSConfiguration} with default configuration values.
* </p>
*/
public PicketLinkSTSConfiguration()
@@ -75,7 +75,7 @@
/**
* <p>
- * Creates an instance of {@code JBossSTSConfiguration} with the specified configuration.
+ * Creates an instance of {@code PicketLinkSTSConfiguration} with the specified configuration.
* </p>
*
* @param config a reference to the object that holds the configuration of the STS.
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/STSClientConfig.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/STSClientConfig.java 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/STSClientConfig.java 2009-11-18 21:20:00 UTC (rev 1028)
@@ -35,8 +35,8 @@
* Example:
* <pre>{@code
* Builder builder = new STSClientConfig.Builder();
- * builder.serviceName("JBossSTS");
- * builder.portName("JBossSTSPort");
+ * builder.serviceName("PicketLinkSTS");
+ * builder.portName("PicketLinkSTSPort");
* ...
* STSClientConfig config = builder.build();
* }</pre>
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/handlers/STSSaml20Handler.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/handlers/STSSaml20Handler.java 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/handlers/STSSaml20Handler.java 2009-11-18 21:20:00 UTC (rev 1028)
@@ -48,7 +48,7 @@
/*
* (non-Javadoc)
- * @see org.picketlink.identity.federation.api.wstrust.handlers.JBossSTSSecurityHandler#getSecurityElementQName()
+ * @see org.picketlink.identity.federation.api.wstrust.handlers.PicketLinkSTSSecurityHandler#getSecurityElementQName()
*/
@Override
public QName getSecurityElementQName()
@@ -58,7 +58,7 @@
/*
* (non-Javadoc)
- * @see org.picketlink.identity.federation.api.wstrust.handlers.JBossSTSSecurityHandler#getTokenElementQName()
+ * @see org.picketlink.identity.federation.api.wstrust.handlers.PicketLinkSTSSecurityHandler#getTokenElementQName()
*/
@Override
public QName getTokenElementQName()
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java 2009-11-18 21:20:00 UTC (rev 1028)
@@ -167,7 +167,7 @@
// create a subject using the caller principal.
Principal principal = context.getCallerPrincipal();
String subjectName = principal == null ? "ANONYMOUS" : principal.getName();
- NameIDType nameID = SAMLAssertionFactory.createNameID(null, "urn:jboss:identity-federation", subjectName);
+ NameIDType nameID = SAMLAssertionFactory.createNameID(null, "urn:picketlink:identity-federation", subjectName);
SubjectType subject = SAMLAssertionFactory.createSubject(nameID, subjectConfirmation);
// create the attribute statements if necessary.
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java 2009-11-18 21:20:00 UTC (rev 1028)
@@ -115,7 +115,7 @@
* configuration file (picketlink-sts.xml) looks like the following:
*
* <pre>
- * <JBossSTS xmlns="urn:jboss:identity-federation:config:1.0"
+ * <PicketLinkSTS xmlns="urn:picketlink:identity-federation:config:1.0"
* STSName="Test STS" TokenTimeout="7200" EncryptToken="true">
* <KeyProvider ClassName="org.jboss.identity.federation.bindings.tomcat.KeyStoreKeyManager">
* <Auth Key="KeyStoreURL" Value="keystore/sts_keystore.jks"/>
@@ -138,7 +138,7 @@
* <ServiceProvider Endpoint="http://services.testcorp.org/provider2" TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profi...
* TruststoreAlias="service2"/>
* </ServiceProviders>
- * </JBossSTS> *
+ * </PicketLinkSTS> *
* </pre>
*
* </p>
@@ -256,7 +256,7 @@
* ID="ID-cc541137-74dc-4fc0-8bcc-7e9e3a4c899d"
* IssueInstant="2009-05-29T18:02:13.458Z">
* <saml2:Issuer>
- * JBossSTS
+ * PicketLinkSTS
* </saml2:Issuer>
* <saml2:Subject>
* <saml2:NameID NameQualifier="http://www.jboss.org">
@@ -835,7 +835,7 @@
assertEquals(2, content.size());
assertEquals("Unexpected type found", NameIDType.class, content.get(0).getDeclaredType());
NameIDType nameID = (NameIDType) content.get(0).getValue();
- assertEquals("Unexpected name id qualifier", "urn:jboss:identity-federation", nameID.getNameQualifier());
+ assertEquals("Unexpected name id qualifier", "urn:picketlink:identity-federation", nameID.getNameQualifier());
assertEquals("Unexpected name id value", "sguilhen", nameID.getValue());
assertEquals("Unexpected type found", SubjectConfirmationType.class, content.get(1).getDeclaredType());
SubjectConfirmationType subjType = (SubjectConfirmationType) content.get(1).getValue();
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java 2009-11-18 21:20:00 UTC (rev 1028)
@@ -142,7 +142,7 @@
JAXBElement<?> content = subject.getContent().get(0);
assertEquals("Unexpected content type", NameIDType.class, content.getDeclaredType());
NameIDType nameID = (NameIDType) content.getValue();
- assertEquals("Unexpected name id qualifier", "urn:jboss:identity-federation", nameID.getNameQualifier());
+ assertEquals("Unexpected name id qualifier", "urn:picketlink:identity-federation", nameID.getNameQualifier());
assertEquals("Unexpected name id", "sguilhen", nameID.getValue());
content = subject.getContent().get(1);
assertEquals("Unexpected content type", SubjectConfirmationType.class, content.getDeclaredType());
@@ -229,7 +229,7 @@
content = subject.getContent().get(0);
assertEquals("Unexpected content type", NameIDType.class, content.getDeclaredType());
nameID = (NameIDType) content.getValue();
- assertEquals("Unexpected name id qualifier", "urn:jboss:identity-federation", nameID.getNameQualifier());
+ assertEquals("Unexpected name id qualifier", "urn:picketlink:identity-federation", nameID.getNameQualifier());
assertEquals("Unexpected name id", "sguilhen", nameID.getValue());
content = subject.getContent().get(1);
assertEquals("Unexpected content type", SubjectConfirmationType.class, content.getDeclaredType());
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/STSClientConfigUnitTestCase.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/STSClientConfigUnitTestCase.java 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/STSClientConfigUnitTestCase.java 2009-11-18 21:20:00 UTC (rev 1028)
@@ -33,9 +33,9 @@
*/
public class STSClientConfigUnitTestCase extends TestCase
{
- final String serviceName = "JBossSTS";
- final String portName = "JBossSTSPort";
- final String endpointAddress = "http://localhost:8080/jboss-sts/JBossSTS";
+ final String serviceName = "PicketLinkSTS";
+ final String portName = "PicketLinkSTSPort";
+ final String endpointAddress = "http://localhost:8080/picketlink-sts/PicketLinkSTS";
final String username = "admin";
final String password = "admin";
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/STSClientUnitTestCase.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/STSClientUnitTestCase.java 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/STSClientUnitTestCase.java 2009-11-18 21:20:00 UTC (rev 1028)
@@ -188,9 +188,9 @@
if(usetest == false)
return;
- String serviceName = "JBossSTS";
- String portName = "JBossSTSPort";
- String endpointAddress = "http://localhost:8080/jboss-sts/JBossSTS";
+ String serviceName = "PicketLinkSTS";
+ String portName = "PicketLinkSTSPort";
+ String endpointAddress = "http://localhost:8080/jboss-sts/PicketLinkSTS";
Builder builder = new STSClientConfig.Builder();
STSClientConfig config = builder.serviceName(serviceName).portName(portName).endpointAddress(endpointAddress).username("admin").password("admin").build();
STSClient client = new STSClient(config);
@@ -207,9 +207,9 @@
return;
Builder stsConfigBuilder = new STSClientConfig.Builder();
- stsConfigBuilder.serviceName("JBossSTS");
- stsConfigBuilder.portName("JBossSTSPort");
- stsConfigBuilder.endpointAddress("http://localhost:8080/jboss-sts/JBossSTS");
+ stsConfigBuilder.serviceName("PicketLinkSTS");
+ stsConfigBuilder.portName("PicketLinkSTSPort");
+ stsConfigBuilder.endpointAddress("http://localhost:8080/jboss-sts/PicketLinkSTS");
stsConfigBuilder.username("admin").password("admin");
STSClient client = new STSClient(stsConfigBuilder.build());
@@ -229,9 +229,9 @@
return;
Builder stsConfigBuilder = new STSClientConfig.Builder();
- stsConfigBuilder.serviceName("JBossSTS");
- stsConfigBuilder.portName("JBossSTSPort");
- stsConfigBuilder.endpointAddress("http://localhost:8080/jboss-sts/JBossSTS");
+ stsConfigBuilder.serviceName("PicketLinkSTS");
+ stsConfigBuilder.portName("PicketLinkSTSPort");
+ stsConfigBuilder.endpointAddress("http://localhost:8080/jboss-sts/PicketLinkSTS");
stsConfigBuilder.username("admin").password("admin");
STSClient client = new STSClient(stsConfigBuilder.build());
@@ -251,9 +251,9 @@
{
// JBoss STS target information.
String targetNS = "http://org.picketlink.trust/sts/";
- QName serviceName = new QName(targetNS, "JBossSTS");
- QName portName = new QName(targetNS, "JBossSTSPort");
- URL endpointAddress = new URL("http://localhost:8080/jboss-sts/JBossSTS");
+ QName serviceName = new QName(targetNS, "PicketLinkSTS");
+ QName portName = new QName(targetNS, "PicketLinkSTSPort");
+ URL endpointAddress = new URL("http://localhost:8080/jboss-sts/PicketLinkSTS");
// URL securityConfigURL = new File("jboss-wsse-client.xml").toURI().toURL();
Service service = Service.create(serviceName);
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-1.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-1.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-1.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,6 +1,6 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0">
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0">
<IdentityURL>http://localhost:8080/idp</IdentityURL>
<Trust>
<Domains>localhost,jboss.com,jboss.org</Domains>
</Trust>
-</JBossIDP>
\ No newline at end of file
+</PicketLinkIDP>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-2.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-2.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-2.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
AssertionValidity="20000"
RoleGenerator="somefqn"
Encrypt="true">
@@ -12,4 +12,4 @@
<ValidatingAlias Key="localhost" Value="localhostalias"/>
<ValidatingAlias Key="jboss.com" Value="jbossalias"/>
</KeyProvider>
-</JBossIDP>
\ No newline at end of file
+</PicketLinkIDP>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-3.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-3.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-3.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0">
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0">
<IdentityURL>http://localhost:8080/idp</IdentityURL>
<Trust>
<Domains>localhost,jboss.com,jboss.org</Domains>
@@ -11,4 +11,4 @@
</KeyProvider>
<ServiceURL>http://localhost:8080/sales</ServiceURL>
-</JBossSP>
\ No newline at end of file
+</PicketLinkSP>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-4.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-4.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-4.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossSTS xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkSTS xmlns="urn:picketlink:identity-federation:config:1.0"
STSName="Test STS" TokenTimeout="7200" EncryptToken="true">
<KeyProvider ClassName="SomeClass">
<ValidatingAlias Key="localhost" Value="localhostalias"/>
@@ -21,4 +21,4 @@
TokenType="specialToken"
TruststoreAlias="providerAlias"/>
</ServiceProviders>
-</JBossSTS>
\ No newline at end of file
+</PicketLinkSTS>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-5.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-5.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-config-5.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="a">
<Option Key="1" Value="1.1"/>
<Option Key="2" Value="2.2"/>
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-metadata-config-1.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-metadata-config-1.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/config/test-metadata-config-1.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
AssertionValidity="20000"
RoleGenerator="somefqn"
Encrypt="true">
@@ -15,4 +15,4 @@
<MetaDataProvider ClassName="org.jboss.test.somefqn">
<Option Key="FileName" Value="myfile"/>
</MetaDataProvider>
-</JBossIDP>
\ No newline at end of file
+</PicketLinkIDP>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/picketlink-sts.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/picketlink-sts.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/picketlink-sts.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossSTS xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkSTS xmlns="urn:picketlink:identity-federation:config:1.0"
STSName="Test STS" TokenTimeout="7200" EncryptToken="false">
<KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
<Auth Key="KeyStoreURL" Value="keystore/sts_keystore.jks"/>
@@ -28,4 +28,4 @@
<ServiceProvider Endpoint="http://services.testcorp.org/provider2" TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"
TruststoreAlias="service2"/>
</ServiceProviders>
-</JBossSTS>
\ No newline at end of file
+</PicketLinkSTS>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/wstrust/assertion-expected.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/wstrust/assertion-expected.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/wstrust/assertion-expected.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,7 +1,7 @@
<Assertion xmlns="urn:oasis:names:tc:SAML:2.0:assertion" ID="ID_74414f7f-1339-4f80-b29a-c947d9177445" IssueInstant="2009-09-10T13:49:30.422Z" Version="2.0">
- <Issuer>JBossSTS</Issuer>
+ <Issuer>PicketLinkSTS</Issuer>
<Subject>
- <NameID NameQualifier="urn:jboss:identity-federation">beve</NameID>
+ <NameID NameQualifier="urn:picketlink:identity-federation">beve</NameID>
<SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"/>
</Subject>
<Conditions NotBefore="2009-09-10T13:49:30.422Z" NotOnOrAfter="2009-09-10T15:49:30.422Z"/>
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/wstrust/assertion.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/wstrust/assertion.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/wstrust/assertion.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Assertion xmlns="urn:oasis:names:tc:SAML:2.0:assertion" ID="ID_74414f7f-1339-4f80-b29a-c947d9177445" IssueInstant="2009-09-10T13:49:30.422Z" Version="2.0">
- <Issuer>JBossSTS</Issuer>
+ <Issuer>PicketLinkSTS</Issuer>
<Subject>
- <NameID NameQualifier="urn:jboss:identity-federation">beve</NameID>
+ <NameID NameQualifier="urn:picketlink:identity-federation">beve</NameID>
<SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"/>
</Subject>
<Conditions NotBefore="2009-09-10T13:49:30.422Z" NotOnOrAfter="2009-09-10T15:49:30.422Z"/>
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/wstrust/sts-client.properties
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/wstrust/sts-client.properties 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/test/resources/wstrust/sts-client.properties 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,5 +1,5 @@
-serviceName=JBossSTS
-portName=JBossSTSPort
-endpointAddress=http://localhost:8080/jboss-sts/JBossSTS
+serviceName=PicketLinkSTS
+portName=PicketLinkSTSPort
+endpointAddress=http://localhost:8080/picketlink-sts/PicketLinkSTS
username=admin
password=admin
Modified: migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.RolesGenerationHandler"/>
Modified: migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
AttributeManager=""
RoleGenerator="org.picketlink.identity.federation.core.impl.EmptyRoleGenerator">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
@@ -6,4 +6,4 @@
<Domains>localhost,jboss.com,jboss.org</Domains>
</Trust>
-</JBossIDP>
+</PicketLinkIDP>
Modified: migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,3 +1,3 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
</Handlers>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,6 +1,6 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0"
AttributeManager="">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
<ServiceURL>http://localhost:8080/employee/</ServiceURL>
-</JBossSP>
\ No newline at end of file
+</PicketLinkSP>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,3 +1,3 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
</Handlers>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,6 +1,6 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0"
AttributeManager="">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
<ServiceURL>http://localhost:8080/sales/</ServiceURL>
-</JBossSP>
\ No newline at end of file
+</PicketLinkSP>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/idp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/idp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/idp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
Modified: migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,8 +1,8 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
AttributeManager="">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
<Trust>
<Domains>localhost,jboss.com,jboss.org</Domains>
</Trust>
-</JBossIDP>
+</PicketLinkIDP>
Modified: migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
Modified: migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-web/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,6 +1,6 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0"
AttributeManager="">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
<ServiceURL>http://localhost:8080/employee/</ServiceURL>
-</JBossSP>
\ No newline at end of file
+</PicketLinkSP>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
</Handlers>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0" ServerEnvironment="tomcat">
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
<ServiceURL>http://localhost:8080/employee/</ServiceURL>
-</JBossSP>
+</PicketLinkSP>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
</Handlers>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0" ServerEnvironment="tomcat">
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat">
<IdentityURL>http://localhost:8080/idp-sig/</IdentityURL>
<ServiceURL>http://localhost:8080/sales-post-sig/</ServiceURL>
<KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
@@ -10,4 +10,4 @@
<ValidatingAlias Key="127.0.0.1" Value="servercert"/>
</KeyProvider>
-</JBossSP>
+</PicketLinkSP>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/idp/src/main/webapp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/idp/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/idp/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/idp/src/main/webapp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/idp/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/idp/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,6 +1,6 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0" >
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" >
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
<Trust>
<Domains>localhost,jboss.com,jboss.org</Domains>
</Trust>
-</JBossIDP>
+</PicketLinkIDP>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2SignatureValidationHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0" >
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" >
<IdentityURL>http://localhost:8080/idp-sig/</IdentityURL>
<Trust>
<Domains>localhost,jboss.com,jboss.org,redhat.com</Domains>
@@ -11,4 +11,4 @@
<ValidatingAlias Key="localhost" Value="servercert"/>
<ValidatingAlias Key="127.0.0.1" Value="servercert"/>
</KeyProvider>
-</JBossIDP>
+</PicketLinkIDP>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/idp-sig-no-val/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0" >
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" >
<IdentityURL>http://localhost:8080/idp-sig/</IdentityURL>
<Trust>
<Domains>localhost,jboss.com,jboss.org,redhat.com</Domains>
@@ -11,4 +11,4 @@
<ValidatingAlias Key="localhost" Value="servercert"/>
<ValidatingAlias Key="127.0.0.1" Value="servercert"/>
</KeyProvider>
-</JBossIDP>
+</PicketLinkIDP>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/idp-standalone/src/main/webapp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/idp-standalone/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/idp-standalone/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/idp-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/idp-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/idp-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0" >
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" >
<IdentityURL>http://localhost:8080/idp-standalone/</IdentityURL>
<Trust>
<Domains>localhost,jboss.com,jboss.org</Domains>
@@ -12,4 +12,4 @@
<ValidatingAlias Key="127.0.0.1" Value="servercert"/>
</KeyProvider>
-</JBossIDP>
+</PicketLinkIDP>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/metadata/resources/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/metadata/resources/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/metadata/resources/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossIDP xmlns="urn:jboss:identity-federation:config:1.0"
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
AssertionValidity="20000"
RoleGenerator="somefqn"
Encrypt="true">
@@ -19,4 +19,4 @@
<MetaDataProvider ClassName="org.picketlink.identity.federation.bindings.providers.FileBasedEntityMetadataProvider">
<Option Key="FileName" Value="WEB-INF/idp-metadata.xml"/>
</MetaDataProvider>
-</JBossIDP>
+</PicketLinkIDP>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/pdp/src/main/webapp/WEB-INF/classes/policyConfig.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/pdp/src/main/webapp/WEB-INF/classes/policyConfig.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/pdp/src/main/webapp/WEB-INF/classes/policyConfig.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<ns:jbosspdp xmlns:ns="urn:jboss:xacml:2.0">
+<ns:jbosspdp xmlns:ns="urn:picketlink:xacml:2.0">
<ns:Policies>
<ns:PolicySet>
<ns:Location>policies/himss-policy.xml</ns:Location>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/sales/src/main/webapp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/sales/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/sales/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
</Handlers>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-webapps/sales/src/main/webapp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/sales/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/sales/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0" ServerEnvironment="tomcat">
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat">
<IdentityURL>http://localhost:8080/idp/</IdentityURL>
<ServiceURL>http://localhost:8080/sales/</ServiceURL>
-</JBossSP>
+</PicketLinkSP>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
</Handlers>
\ No newline at end of file
Modified: migration/picketlink/federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0" ServerEnvironment="tomcat">
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat">
<IdentityURL>http://localhost:8080/idp-sig/</IdentityURL>
<ServiceURL>http://localhost:8080/sales-post-sig/</ServiceURL>
<KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
@@ -10,4 +10,4 @@
<ValidatingAlias Key="127.0.0.1" Value="servercert"/>
</KeyProvider>
-</JBossSP>
+</PicketLinkSP>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/sales-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/sales-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/sales-sig/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2SignatureGenerationHandler"/>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/sales-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/sales-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/sales-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0" ServerEnvironment="tomcat">
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat">
<IdentityURL>http://localhost:8080/idp-sig/</IdentityURL>
<ServiceURL>http://localhost:8080/sales-sig/</ServiceURL>
<KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
@@ -10,4 +10,4 @@
<ValidatingAlias Key="127.0.0.1" Value="servercert"/>
</KeyProvider>
-</JBossSP>
+</PicketLinkSP>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/sales-standalone/src/main/webapp/WEB-INF/picketlink-handlers.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/sales-standalone/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/sales-standalone/src/main/webapp/WEB-INF/picketlink-handlers.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<Handlers xmlns="urn:jboss:identity-federation:handler:config:1.0">
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
<Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
Modified: migration/picketlink/federation/trunk/picketlink-webapps/sales-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml
===================================================================
--- migration/picketlink/federation/trunk/picketlink-webapps/sales-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 20:51:07 UTC (rev 1027)
+++ migration/picketlink/federation/trunk/picketlink-webapps/sales-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml 2009-11-18 21:20:00 UTC (rev 1028)
@@ -1,4 +1,4 @@
-<JBossSP xmlns="urn:jboss:identity-federation:config:1.0" ServerEnvironment="tomcat">
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat">
<IdentityURL>http://localhost:8080/idp-standalone/</IdentityURL>
<ServiceURL>http://localhost:8080/sales-standalone/</ServiceURL>
<KeyProvider ClassName="org.picketlink.identity.federation.bindings.tomcat.KeyStoreKeyManager">
@@ -10,4 +10,4 @@
<ValidatingAlias Key="127.0.0.1" Value="servercert"/>
</KeyProvider>
-</JBossSP>
+</PicketLinkSP>
16 years, 6 months
JBoss Identity SVN: r1027 - migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config.
by jboss-identity-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-11-18 15:51:07 -0500 (Wed, 18 Nov 2009)
New Revision: 1027
Modified:
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed.xsd
Log:
migrate
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed.xsd
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed.xsd 2009-11-18 20:49:47 UTC (rev 1026)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed.xsd 2009-11-18 20:51:07 UTC (rev 1027)
@@ -34,7 +34,7 @@
</complexContent>
</complexType>
- <element name="picketlinkIDP" type="tns:IDPType">
+ <element name="PicketLinkIDP" type="tns:IDPType">
<annotation>
<documentation>The root configuration for an Identity Provider(IDP) using picketlink Identity.</documentation>
</annotation>
16 years, 6 months
JBoss Identity SVN: r1026 - migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config.
by jboss-identity-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-11-18 15:49:47 -0500 (Wed, 18 Nov 2009)
New Revision: 1026
Modified:
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed.xsd
Log:
migrate
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed.xsd
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed.xsd 2009-11-18 20:47:52 UTC (rev 1025)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed.xsd 2009-11-18 20:49:47 UTC (rev 1026)
@@ -142,7 +142,7 @@
</complexContent>
</complexType>
- <element name="picketlinkSP" type="tns:SPType"></element>
+ <element name="PicketLinkSP" type="tns:SPType"></element>
<simpleType name="EncAlgoType">
<restriction base="string">
@@ -249,6 +249,6 @@
<attribute name="TruststoreAlias" type="string" use="optional"/>
</complexType>
- <element name="picketlinkSTS" type="tns:STSType"/>
+ <element name="PicketLinkSTS" type="tns:STSType"/>
</schema>
\ No newline at end of file
16 years, 6 months
JBoss Identity SVN: r1025 - migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config.
by jboss-identity-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-11-18 15:47:52 -0500 (Wed, 18 Nov 2009)
New Revision: 1025
Modified:
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/Handler.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/Handlers.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/ObjectFactory.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/package-info.java
Log:
migrate
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/Handler.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/Handler.java 2009-11-18 20:47:09 UTC (rev 1024)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/Handler.java 2009-11-18 20:47:52 UTC (rev 1025)
@@ -28,7 +28,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="Option" type="{urn:jboss:identity-federation:config:1.0}KeyValueType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="Option" type="{urn:picketlink:identity-federation:config:1.0}KeyValueType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="class" type="{http://www.w3.org/2001/XMLSchema}string" />
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/Handlers.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/Handlers.java 2009-11-18 20:47:09 UTC (rev 1024)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/Handlers.java 2009-11-18 20:47:52 UTC (rev 1025)
@@ -26,7 +26,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="Handler" type="{urn:jboss:identity-federation:handler:config:1.0}Handler" maxOccurs="unbounded"/>
+ * <element name="Handler" type="{urn:picketlink:identity-federation:handler:config:1.0}Handler" maxOccurs="unbounded"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/ObjectFactory.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/ObjectFactory.java 2009-11-18 20:47:09 UTC (rev 1024)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/ObjectFactory.java 2009-11-18 20:47:52 UTC (rev 1025)
@@ -17,7 +17,7 @@
/**
* This object contains factory methods for each
* Java content interface and Java element interface
- * generated in the jboss.identity_federation.handler.config._1 package.
+ * generated in the picketlink.identity_federation.handler.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
@@ -31,10 +31,10 @@
@XmlRegistry
public class ObjectFactory {
- private final static QName _Handlers_QNAME = new QName("urn:jboss:identity-federation:handler:config:1.0", "Handlers");
+ private final static QName _Handlers_QNAME = new QName("urn:picketlink:identity-federation:handler:config:1.0", "Handlers");
/**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: jboss.identity_federation.handler.config._1
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: picketlink.identity_federation.handler.config._1
*
*/
public ObjectFactory() {
@@ -60,7 +60,7 @@
* Create an instance of {@link JAXBElement }{@code <}{@link Handlers }{@code >}}
*
*/
- @XmlElementDecl(namespace = "urn:jboss:identity-federation:handler:config:1.0", name = "Handlers")
+ @XmlElementDecl(namespace = "urn:picketlink:identity-federation:handler:config:1.0", name = "Handlers")
public JAXBElement<Handlers> createHandlers(Handlers value) {
return new JAXBElement<Handlers>(_Handlers_QNAME, Handlers.class, null, value);
}
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/package-info.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/package-info.java 2009-11-18 20:47:09 UTC (rev 1024)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/handler/config/package-info.java 2009-11-18 20:47:52 UTC (rev 1025)
@@ -5,5 +5,5 @@
// Generated on: 2009.10.06 at 01:13:30 PM CDT
//
-(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:identity-federation:handler:config:1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:picketlink:identity-federation:handler:config:1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.picketlink.identity.federation.core.handler.config;
16 years, 6 months
JBoss Identity SVN: r1024 - in migration/picketlink/federation/trunk/picketlink-fed-core/src/main: resources/schema/config and 1 other directory.
by jboss-identity-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-11-18 15:47:09 -0500 (Wed, 18 Nov 2009)
New Revision: 1024
Modified:
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/AuthPropertyType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorsType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/EncryptionType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/IDPType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/KeyProviderType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/MetadataProviderType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ObjectFactory.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ProviderType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/SPType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/STSType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ServiceProvidersType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProviderType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProvidersType.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/package-info.java
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed-handler.xsd
migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed.xsd
Log:
migrate
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/AuthPropertyType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/AuthPropertyType.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/AuthPropertyType.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -20,7 +20,7 @@
* <pre>
* <complexType name="AuthPropertyType">
* <complexContent>
- * <extension base="{urn:jboss:identity-federation:config:1.0}KeyValueType">
+ * <extension base="{urn:picketlink:identity-federation:config:1.0}KeyValueType">
* </extension>
* </complexContent>
* </complexType>
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorType.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorType.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -27,7 +27,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="Property" type="{urn:jboss:identity-federation:config:1.0}KeyValueType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="Property" type="{urn:picketlink:identity-federation:config:1.0}KeyValueType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* <attribute name="ProcessorClass" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="Dialect" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorsType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorsType.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ClaimsProcessorsType.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -30,7 +30,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="ClaimsProcessor" type="{urn:jboss:identity-federation:config:1.0}ClaimsProcessorType" maxOccurs="unbounded"/>
+ * <element name="ClaimsProcessor" type="{urn:picketlink:identity-federation:config:1.0}ClaimsProcessorType" maxOccurs="unbounded"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/EncryptionType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/EncryptionType.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/EncryptionType.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -22,7 +22,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="EncAlgo" type="{urn:jboss:identity-federation:config:1.0}EncAlgoType"/>
+ * <element name="EncAlgo" type="{urn:picketlink:identity-federation:config:1.0}EncAlgoType"/>
* <element name="KeySize" type="{http://www.w3.org/2001/XMLSchema}int"/>
* </sequence>
* </restriction>
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/IDPType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/IDPType.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/IDPType.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -28,9 +28,9 @@
* <pre>
* <complexType name="IDPType">
* <complexContent>
- * <extension base="{urn:jboss:identity-federation:config:1.0}ProviderType">
+ * <extension base="{urn:picketlink:identity-federation:config:1.0}ProviderType">
* <sequence>
- * <element name="Encryption" type="{urn:jboss:identity-federation:config:1.0}EncryptionType" minOccurs="0"/>
+ * <element name="Encryption" type="{urn:picketlink:identity-federation:config:1.0}EncryptionType" minOccurs="0"/>
* </sequence>
* <attribute name="AssertionValidity" type="{http://www.w3.org/2001/XMLSchema}long" default="300000" />
* <attribute name="RoleGenerator" type="{http://www.w3.org/2001/XMLSchema}string" default="org.picketlink.identity.federation.bindings.tomcat.TomcatRoleGenerator" />
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/KeyProviderType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/KeyProviderType.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/KeyProviderType.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -31,8 +31,8 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="Auth" type="{urn:jboss:identity-federation:config:1.0}AuthPropertyType" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="ValidatingAlias" type="{urn:jboss:identity-federation:config:1.0}KeyValueType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="Auth" type="{urn:picketlink:identity-federation:config:1.0}AuthPropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="ValidatingAlias" type="{urn:picketlink:identity-federation:config:1.0}KeyValueType" maxOccurs="unbounded" minOccurs="0"/>
* <element name="SigningAlias" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
* </sequence>
* <attribute name="ClassName" type="{http://www.w3.org/2001/XMLSchema}string" />
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/MetadataProviderType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/MetadataProviderType.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/MetadataProviderType.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -27,7 +27,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="Option" type="{urn:jboss:identity-federation:config:1.0}KeyValueType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="Option" type="{urn:picketlink:identity-federation:config:1.0}KeyValueType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* <attribute name="ClassName" type="{http://www.w3.org/2001/XMLSchema}string" />
* </restriction>
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ObjectFactory.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ObjectFactory.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ObjectFactory.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -17,7 +17,7 @@
/**
* This object contains factory methods for each
* Java content interface and Java element interface
- * generated in the jboss.identity_federation.config._1 package.
+ * generated in the picketlink.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
@@ -31,12 +31,12 @@
@XmlRegistry
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");
+ private final static QName _picketlinkIDP_QNAME = new QName("urn:picketlink:identity-federation:config:1.0", "picketlinkIDP");
+ private final static QName _picketlinkSTS_QNAME = new QName("urn:picketlink:identity-federation:config:1.0", "picketlinkSTS");
+ private final static QName _picketlinkSP_QNAME = new QName("urn:picketlink:identity-federation:config:1.0", "picketlinkSP");
/**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: jboss.identity_federation.config._1
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: picketlink.identity_federation.config._1
*
*/
public ObjectFactory() {
@@ -174,27 +174,27 @@
* Create an instance of {@link JAXBElement }{@code <}{@link IDPType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "urn:jboss:identity-federation:config:1.0", name = "JBossIDP")
- public JAXBElement<IDPType> createJBossIDP(IDPType value) {
- return new JAXBElement<IDPType>(_JBossIDP_QNAME, IDPType.class, null, value);
+ @XmlElementDecl(namespace = "urn:picketlink:identity-federation:config:1.0", name = "picketlinkIDP")
+ public JAXBElement<IDPType> createpicketlinkIDP(IDPType value) {
+ return new JAXBElement<IDPType>(_picketlinkIDP_QNAME, IDPType.class, null, value);
}
/**
* 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);
+ @XmlElementDecl(namespace = "urn:picketlink:identity-federation:config:1.0", name = "picketlinkSTS")
+ public JAXBElement<STSType> createpicketlinkSTS(STSType value) {
+ return new JAXBElement<STSType>(_picketlinkSTS_QNAME, STSType.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link SPType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "urn:jboss:identity-federation:config:1.0", name = "JBossSP")
- public JAXBElement<SPType> createJBossSP(SPType value) {
- return new JAXBElement<SPType>(_JBossSP_QNAME, SPType.class, null, value);
+ @XmlElementDecl(namespace = "urn:picketlink:identity-federation:config:1.0", name = "picketlinkSP")
+ public JAXBElement<SPType> createpicketlinkSP(SPType value) {
+ return new JAXBElement<SPType>(_picketlinkSP_QNAME, SPType.class, null, value);
}
}
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ProviderType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ProviderType.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ProviderType.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -29,14 +29,14 @@
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
* <element name="IdentityURL" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="Trust" type="{urn:jboss:identity-federation:config:1.0}TrustType" minOccurs="0"/>
- * <element name="KeyProvider" type="{urn:jboss:identity-federation:config:1.0}KeyProviderType" minOccurs="0"/>
- * <element name="MetaDataProvider" type="{urn:jboss:identity-federation:config:1.0}MetadataProviderType" minOccurs="0"/>
+ * <element name="Trust" type="{urn:picketlink:identity-federation:config:1.0}TrustType" minOccurs="0"/>
+ * <element name="KeyProvider" type="{urn:picketlink:identity-federation:config:1.0}KeyProviderType" minOccurs="0"/>
+ * <element name="MetaDataProvider" type="{urn:picketlink:identity-federation:config:1.0}MetadataProviderType" minOccurs="0"/>
* </sequence>
- * <attribute name="ServerEnvironment" default="JBOSS">
+ * <attribute name="ServerEnvironment" default="picketlink">
* <simpleType>
* <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- * <enumeration value="JBOSS"/>
+ * <enumeration value="picketlink"/>
* <enumeration value="TOMCAT"/>
* </restriction>
* </simpleType>
@@ -178,7 +178,7 @@
*/
public String getServerEnvironment() {
if (serverEnvironment == null) {
- return "JBOSS";
+ return "picketlink";
} else {
return serverEnvironment;
}
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/SPType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/SPType.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/SPType.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -24,7 +24,7 @@
* <pre>
* <complexType name="SPType">
* <complexContent>
- * <extension base="{urn:jboss:identity-federation:config:1.0}ProviderType">
+ * <extension base="{urn:picketlink:identity-federation:config:1.0}ProviderType">
* <sequence>
* <element name="ServiceURL" type="{http://www.w3.org/2001/XMLSchema}string"/>
* </sequence>
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/STSType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/STSType.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/STSType.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -25,13 +25,13 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="KeyProvider" type="{urn:jboss:identity-federation:config:1.0}KeyProviderType" minOccurs="0"/>
+ * <element name="KeyProvider" type="{urn:picketlink:identity-federation:config:1.0}KeyProviderType" minOccurs="0"/>
* <element name="RequestHandler" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="ClaimsProcessors" type="{urn:jboss:identity-federation:config:1.0}ClaimsProcessorsType" minOccurs="0"/>
- * <element name="TokenProviders" type="{urn:jboss:identity-federation:config:1.0}TokenProvidersType" minOccurs="0"/>
- * <element name="ServiceProviders" type="{urn:jboss:identity-federation:config:1.0}ServiceProvidersType" minOccurs="0"/>
+ * <element name="ClaimsProcessors" type="{urn:picketlink:identity-federation:config:1.0}ClaimsProcessorsType" minOccurs="0"/>
+ * <element name="TokenProviders" type="{urn:picketlink:identity-federation:config:1.0}TokenProvidersType" minOccurs="0"/>
+ * <element name="ServiceProviders" type="{urn:picketlink:identity-federation:config:1.0}ServiceProvidersType" minOccurs="0"/>
* </sequence>
- * <attribute name="STSName" type="{http://www.w3.org/2001/XMLSchema}string" default="JBossSTS" />
+ * <attribute name="STSName" type="{http://www.w3.org/2001/XMLSchema}string" default="picketlinkSTS" />
* <attribute name="TokenTimeout" type="{http://www.w3.org/2001/XMLSchema}int" default="3600" />
* <attribute name="SignToken" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
* <attribute name="EncryptToken" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
@@ -201,7 +201,7 @@
*/
public String getSTSName() {
if (stsName == null) {
- return "JBossSTS";
+ return "picketlinkSTS";
} else {
return stsName;
}
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ServiceProvidersType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ServiceProvidersType.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/ServiceProvidersType.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -30,7 +30,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="ServiceProvider" type="{urn:jboss:identity-federation:config:1.0}ServiceProviderType" maxOccurs="unbounded"/>
+ * <element name="ServiceProvider" type="{urn:picketlink:identity-federation:config:1.0}ServiceProviderType" maxOccurs="unbounded"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProviderType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProviderType.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProviderType.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -27,7 +27,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="Property" type="{urn:jboss:identity-federation:config:1.0}KeyValueType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="Property" type="{urn:picketlink:identity-federation:config:1.0}KeyValueType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* <attribute name="ProviderClass" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="TokenType" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProvidersType.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProvidersType.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/TokenProvidersType.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -32,7 +32,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="TokenProvider" type="{urn:jboss:identity-federation:config:1.0}TokenProviderType" maxOccurs="unbounded"/>
+ * <element name="TokenProvider" type="{urn:picketlink:identity-federation:config:1.0}TokenProviderType" maxOccurs="unbounded"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/package-info.java
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/package-info.java 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/config/package-info.java 2009-11-18 20:47:09 UTC (rev 1024)
@@ -5,5 +5,5 @@
// Generated on: 2009.09.03 at 01:21:42 PM BRT
//
-(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:identity-federation:config:1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:picketlink:identity-federation:config:1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.picketlink.identity.federation.core.config;
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed-handler.xsd
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed-handler.xsd 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed-handler.xsd 2009-11-18 20:47:09 UTC (rev 1024)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:jboss:identity-federation:handler:config:1.0"
- xmlns:tns="urn:jboss:identity-federation:handler:config:1.0"
- xmlns:idfed="urn:jboss:identity-federation:config:1.0"
+ targetNamespace="urn:picketlink:identity-federation:handler:config:1.0"
+ xmlns:tns="urn:picketlink:identity-federation:handler:config:1.0"
+ xmlns:idfed="urn:picketlink:identity-federation:config:1.0"
elementFormDefault="qualified">
<!-- Import the JBID configuration schema -->
- <import schemaLocation="jboss-identity-fed.xsd"
- namespace="urn:jboss:identity-federation:config:1.0">
+ <import schemaLocation="picketlink-fed.xsd"
+ namespace="urn:picketlink:identity-federation:config:1.0">
</import>
Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed.xsd
===================================================================
--- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed.xsd 2009-11-18 20:39:14 UTC (rev 1023)
+++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/resources/schema/config/picketlink-fed.xsd 2009-11-18 20:47:09 UTC (rev 1024)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:jboss:identity-federation:config:1.0"
- xmlns:tns="urn:jboss:identity-federation:config:1.0"
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:picketlink:identity-federation:config:1.0"
+ xmlns:tns="urn:picketlink:identity-federation:config:1.0"
elementFormDefault="qualified" version="1.0">
<complexType name="IDPType">
<annotation>
@@ -21,11 +21,11 @@
</attribute>
<attribute name="RoleGenerator" type="string"
use="optional"
- default="org.jboss.identity.federation.bindings.tomcat.TomcatRoleGenerator">
+ default="org.picketlink.identity.federation.bindings.tomcat.TomcatRoleGenerator">
</attribute>
<attribute name="AttributeManager" type="string"
use="optional"
- default="org.jboss.identity.federation.bindings.tomcat.TomcatAttributeManager">
+ default="org.picketlink.identity.federation.bindings.tomcat.TomcatAttributeManager">
</attribute>
<attribute name="Encrypt" type="boolean" use="optional"
default="false">
@@ -34,9 +34,9 @@
</complexContent>
</complexType>
- <element name="JBossIDP" type="tns:IDPType">
+ <element name="picketlinkIDP" type="tns:IDPType">
<annotation>
- <documentation>The root configuration for an Identity Provider(IDP) using JBoss Identity.</documentation>
+ <documentation>The root configuration for an Identity Provider(IDP) using picketlink Identity.</documentation>
</annotation>
</element>
@@ -48,7 +48,7 @@
<sequence>
<element name="Domains" type="string">
<annotation>
- <documentation>Comma Separated domain names such as localhost,jboss.com,jboss.org</documentation>
+ <documentation>Comma Separated domain names such as localhost,picketlink.com,picketlink.org</documentation>
</annotation>
</element>
</sequence>
@@ -113,10 +113,10 @@
<element name="MetaDataProvider" type="tns:MetadataProviderType" maxOccurs="1" minOccurs="0"></element>
</sequence>
<!-- Specify what is the server environment where the IDP or SP exists -->
- <attribute name="ServerEnvironment" use="optional" default="JBOSS">
+ <attribute name="ServerEnvironment" use="optional" default="picketlink">
<simpleType>
<restriction base="string">
- <enumeration value="JBOSS"></enumeration>
+ <enumeration value="picketlink"></enumeration>
<enumeration value="TOMCAT"></enumeration>
</restriction>
</simpleType>
@@ -142,7 +142,7 @@
</complexContent>
</complexType>
- <element name="JBossSP" type="tns:SPType"></element>
+ <element name="picketlinkSP" type="tns:SPType"></element>
<simpleType name="EncAlgoType">
<restriction base="string">
@@ -176,7 +176,7 @@
<element name="TokenProviders" type="tns:TokenProvidersType" minOccurs="0"/>
<element name="ServiceProviders" type="tns:ServiceProvidersType" minOccurs="0"/>
</sequence>
- <attribute name="STSName" default="JBossSTS" type="string" use="optional"/>
+ <attribute name="STSName" default="picketlinkSTS" type="string" use="optional"/>
<attribute name="TokenTimeout" default="3600" type="int" use="optional"/>
<attribute name="SignToken" default="true" type="boolean" use="optional"/>
<attribute name="EncryptToken" default="false" type="boolean" use="optional"/>
@@ -249,6 +249,6 @@
<attribute name="TruststoreAlias" type="string" use="optional"/>
</complexType>
- <element name="JBossSTS" type="tns:STSType"/>
+ <element name="picketlinkSTS" type="tns:STSType"/>
</schema>
\ No newline at end of file
16 years, 6 months