jboss-identity-commits
November 2009
jboss-identity-commits@lists.jboss.org
- 1 participants
- 196 discussions
JBoss Identity SVN: r1043 - migration/picketlink.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-11-19 11:25:38 -0500 (Thu, 19 Nov 2009)
New Revision: 1043
Removed:
migration/picketlink/idm/
Log:
remove
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r1042 - migration/picketlink.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-11-19 11:24:14 -0500 (Thu, 19 Nov 2009)
New Revision: 1042
Removed:
migration/picketlink/identity-federation/
Log:
remove
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r1041 - in migration/idm/trunk: picketlink-idm-hibernate/src/main/resources/mappings and 2 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-19 10:29:00 -0500 (Thu, 19 Nov 2009)
New Revision: 1041
Modified:
migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml
migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml
migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml
migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml
migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml
migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml
migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml
migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObject.hbm.xml
migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml
migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml
migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml
migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml
migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateRealm.hbm.xml
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml
Log:
mappings update
Modified: migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -14,7 +14,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude"/>
<releaseinfo>
- 1.0.0.Beta4
+ 1.0.0.CR1
</releaseinfo>
Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -14,7 +14,7 @@
<set name="attributes"
inverse="true"
cascade="all, delete-orphan"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key>
@@ -25,7 +25,7 @@
<set name="credentials"
inverse="true"
cascade="all, delete-orphan"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key>
@@ -35,7 +35,7 @@
</set>
<set name="fromRelationships"
inverse="true"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key>
@@ -63,7 +63,7 @@
<map name="properties"
table="jbid_io_props"
cascade="all, delete-orphan"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key column="PROP_ID"/>
@@ -83,7 +83,7 @@
</many-to-one>
<set name="toRelationships"
inverse="true"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key>
Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -35,7 +35,7 @@
table="jbid_io_attr_text_values"
cascade="all, delete-orphan"
access="field"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key column="TEXT_ATTR_VALUE_ID"/>
Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -33,7 +33,7 @@
<map name="properties"
table="jbid_io_creden_props"
cascade="all, delete-orphan"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key column="PROP_ID"/>
Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -50,7 +50,7 @@
table="jbid_io_rel_props"
cascade="all, delete-orphan"
fetch="subselect"
- lazy="true">
+ lazy="extra">
<cache usage="read-write"/>
<key column="PROP_ID"/>
<map-key type="string"
Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -24,7 +24,7 @@
<map name="properties"
table="jbid_io_rel_name_props"
cascade="all, delete-orphan"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key column="PROP_ID"/>
Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -23,7 +23,7 @@
table="jbid_real_props"
cascade="all, delete-orphan"
fetch="subselect"
- lazy="true">
+ lazy="extra">
<cache usage="read-write"/>
<key column="PROP_ID"/>
<map-key type="string"
Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObject.hbm.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObject.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObject.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -14,7 +14,7 @@
<set name="attributes"
inverse="true"
cascade="all, delete-orphan"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key>
@@ -25,7 +25,7 @@
<set name="credentials"
inverse="true"
cascade="all, delete-orphan"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key>
@@ -35,7 +35,7 @@
</set>
<set name="fromRelationships"
inverse="true"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key>
@@ -63,7 +63,7 @@
<map name="properties"
table="jbid_io_props"
cascade="all, delete-orphan"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key column="PROP_ID"/>
@@ -83,7 +83,7 @@
</many-to-one>
<set name="toRelationships"
inverse="true"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key>
Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -35,7 +35,7 @@
table="jbid_io_attr_text_values"
cascade="all, delete-orphan"
access="field"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key column="TEXT_ATTR_VALUE_ID"/>
Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -33,7 +33,7 @@
<map name="properties"
table="jbid_io_creden_props"
cascade="all, delete-orphan"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key column="PROP_ID"/>
Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -50,7 +50,7 @@
table="jbid_io_rel_props"
cascade="all, delete-orphan"
fetch="subselect"
- lazy="true">
+ lazy="extra">
<cache usage="read-write"/>
<key column="PROP_ID"/>
<map-key type="string"
Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -24,7 +24,7 @@
<map name="properties"
table="jbid_io_rel_name_props"
cascade="all, delete-orphan"
- lazy="true"
+ lazy="extra"
fetch="subselect">
<cache usage="read-write"/>
<key column="PROP_ID"/>
Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateRealm.hbm.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateRealm.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateRealm.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -23,7 +23,7 @@
table="jbid_real_props"
cascade="all, delete-orphan"
fetch="subselect"
- lazy="true">
+ lazy="extra">
<cache usage="read-write"/>
<key column="PROP_ID"/>
<map-key type="string"
Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml 2009-11-19 15:07:00 UTC (rev 1040)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml 2009-11-19 15:29:00 UTC (rev 1041)
@@ -173,34 +173,6 @@
<identity-object-type>
<name>USER</name>
<relationships>
- <!--<relationship>-->
- <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>-->
- <!--<identity-object-type-ref>ORGANIZATION</identity-object-type-ref>-->
- <!--</relationship>-->
- <!--<relationship>-->
- <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>-->
- <!--<identity-object-type-ref>COMMUNITY</identity-object-type-ref>-->
- <!--</relationship>-->
- <!--<relationship>-->
- <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>-->
- <!--<identity-object-type-ref>OFFICE</identity-object-type-ref>-->
- <!--</relationship>-->
- <!--<relationship>-->
- <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>-->
- <!--<identity-object-type-ref>SECURITY</identity-object-type-ref>-->
- <!--</relationship>-->
- <!--<relationship>-->
- <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>-->
- <!--<identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>-->
- <!--</relationship>-->
- <!--<relationship>-->
- <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>-->
- <!--<identity-object-type-ref>PROJECT</identity-object-type-ref>-->
- <!--</relationship>-->
- <!--<relationship>-->
- <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>-->
- <!--<identity-object-type-ref>PEOPLE</identity-object-type-ref>-->
- <!--</relationship>-->
</relationships>
<credentials>
<credential-type>PASSWORD</credential-type>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r1040 - in migration/idm/trunk: assembly/scripts and 4 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-19 10:07:00 -0500 (Thu, 19 Nov 2009)
New Revision: 1040
Added:
migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-hsqldb-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-hsqldburl-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-mssql-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-mysql-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-oracle-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-postgresql-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-sybase-ds.xml
Removed:
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldb-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldburl-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mssql-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mysql-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-oracle-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-postgresql-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-sybase-ds.xml
Modified:
migration/idm/trunk/assembly/pom.xml
migration/idm/trunk/assembly/scripts/assembly-distro.xml
migration/idm/trunk/assembly/src/main/files/jboss/build.xml
migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.cfg.xml
migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.picketlink.idm.cfg.xml
Log:
* another update for renaming.
Modified: migration/idm/trunk/assembly/pom.xml
===================================================================
--- migration/idm/trunk/assembly/pom.xml 2009-11-19 13:31:09 UTC (rev 1039)
+++ migration/idm/trunk/assembly/pom.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm</groupId>
- <artifactId>jbossidm</artifactId>
+ <artifactId>picketlink-idm</artifactId>
<version>1.0.0-CR1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>PicketLink IDM Assembly </name>
Modified: migration/idm/trunk/assembly/scripts/assembly-distro.xml
===================================================================
--- migration/idm/trunk/assembly/scripts/assembly-distro.xml 2009-11-19 13:31:09 UTC (rev 1039)
+++ migration/idm/trunk/assembly/scripts/assembly-distro.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -24,7 +24,7 @@
<outputDirectory>modules</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>org.picketlink.idm.integration:idm-jboss5-deployer:zip:deployer</include>
+ <include>org.picketlink.idm.integration:picketlink-idm-jboss5-deployer:zip:deployer</include>
</includes>
<unpack>true</unpack>
</dependencySet>
@@ -32,7 +32,7 @@
<outputDirectory>modules</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>org.picketlink.idm.integration:idm-jboss5-deployer:zip:config</include>
+ <include>org.picketlink.idm.integration:picketlink-idm-jboss5-deployer:zip:config</include>
</includes>
<unpack>true</unpack>
</dependencySet>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/build.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/build.xml 2009-11-19 13:31:09 UTC (rev 1039)
+++ migration/idm/trunk/assembly/src/main/files/jboss/build.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -61,7 +61,7 @@
<!-- copy the right hibernate configuration file -->
<copy file="${picketlink.idm.home}/jboss/hibernate.cfg/${database}.hibernate.cfg.xml"
- tofile="${jboss.server.config.dir}/deploy/picketlink-idm/picketlink-idm-service.sar/jboss.idm.hibernate.cfg.xml"
+ tofile="${jboss.server.config.dir}/deploy/picketlink-idm/picketlink-idm-service.sar/picketlink.idm.hibernate.cfg.xml"
overwrite="true" />
<!-- copy the right datasource configuration file and replace the jdbc properties with
Deleted: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldb-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldb-ds.xml 2009-11-19 13:31:09 UTC (rev 1039)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldb-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
-
- <local-tx-datasource>
- <jndi-name>PicketLinkIDMDS</jndi-name>
-
- <connection-url>jdbc:hsqldb:hsql://localhost:1701</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=picketlinkIDM</depends>
- </local-tx-datasource>
-
- <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbossidm">
- <attribute name="Database">picketlinkIDM</attribute>
- <attribute name="InProcessMode">false</attribute>
- </mbean>
-
-</datasources>
Deleted: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldburl-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldburl-ds.xml 2009-11-19 13:31:09 UTC (rev 1039)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldburl-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
-
- <local-tx-datasource>
- <jndi-name>PicketLinkIDMDS</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=picketlinkIDM</depends>
- </local-tx-datasource>
-
- <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbossidm">
- <attribute name="Database">picketlinkIDM</attribute>
- <attribute name="InProcessMode">true</attribute>
- </mbean>
-
-</datasources>
Deleted: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mssql-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mssql-ds.xml 2009-11-19 13:31:09 UTC (rev 1039)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mssql-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<datasources>
- <local-tx-datasource>
- <jndi-name>PicketLinkIDMDS</jndi-name>
- <connection-url>@jdbc.url@</connection-url>
- <driver-class>@jdbc.driver@</driver-class>
- <user-name>@jdbc.username@</user-name>
- <password>@jdbc.password@</password>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <metadata>
- <type-mapping>MS SQLSERVER2000</type-mapping>
- </metadata>
- </local-tx-datasource>
-
-</datasources>
Deleted: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mysql-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mysql-ds.xml 2009-11-19 13:31:09 UTC (rev 1039)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mysql-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
- <local-tx-datasource>
- <jndi-name>PicketLinkIDMDS</jndi-name>
-
- <connection-url>@jdbc.url@</connection-url>
- <driver-class>com.mysql.jdbc.Driver</driver-class>
-
- <user-name>@jdbc.username@</user-name>
- <password>@jdbc.password@</password>
-
- <!-- Typemapping for JBoss 4.0 -->
- <metadata>
- <type-mapping>mySQL</type-mapping>
- </metadata>
-
- </local-tx-datasource>
-</datasources>
\ No newline at end of file
Deleted: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-oracle-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-oracle-ds.xml 2009-11-19 13:31:09 UTC (rev 1039)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-oracle-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<datasources>
- <local-tx-datasource>
- <jndi-name>PicketLinkIDMDS</jndi-name>
- <connection-url>@jdbc.url@</connection-url>
- <driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
- <user-name>@jdbc.username@</user-name>
- <password>@jdbc.password@</password>
-
- <min-pool-size>5</min-pool-size>
- <max-pool-size>100</max-pool-size>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <metadata>
- <type-mapping>Oracle9i</type-mapping>
- </metadata>
- </local-tx-datasource>
-</datasources>
Deleted: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-postgresql-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-postgresql-ds.xml 2009-11-19 13:31:09 UTC (rev 1039)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-postgresql-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<datasources>
- <local-tx-datasource>
- <jndi-name>PicketLinkIDMDS</jndi-name>
- <connection-url>@jdbc.url@</connection-url>
- <driver-class>org.postgresql.Driver</driver-class>
- <user-name>@jdbc.username@</user-name>
- <password>@jdbc.password@</password>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <metadata>
- <type-mapping>PostgreSQL 8.0</type-mapping>
- </metadata>
- </local-tx-datasource>
-</datasources>
Deleted: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-sybase-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-sybase-ds.xml 2009-11-19 13:31:09 UTC (rev 1039)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-sybase-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<datasources>
- <local-tx-datasource>
- <jndi-name>PicketLinkIDMDS</jndi-name>
- <connection-url>@jdbc.url@</connection-url>
- <driver-class>@jdbc.driver@</driver-class>
- <user-name>@jdbc.username@</user-name>
- <password>@jdbc.password@</password>
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter</exception-sorter-class-name>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <metadata>
- <type-mapping>Sybase</type-mapping>
- </metadata>
- </local-tx-datasource>
-</datasources>
-
Copied: migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-hsqldb-ds.xml (from rev 1039, migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldb-ds.xml)
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-hsqldb-ds.xml (rev 0)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-hsqldb-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources>
+
+ <local-tx-datasource>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
+
+ <connection-url>jdbc:hsqldb:hsql://localhost:1701</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=picketlinkIDM</depends>
+ </local-tx-datasource>
+
+ <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=picketlinkIDM">
+ <attribute name="Database">picketlinkIDM</attribute>
+ <attribute name="InProcessMode">false</attribute>
+ </mbean>
+
+</datasources>
Copied: migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-hsqldburl-ds.xml (from rev 1039, migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldburl-ds.xml)
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-hsqldburl-ds.xml (rev 0)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-hsqldburl-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources>
+
+ <local-tx-datasource>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
+
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}picketlinkIDM</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=picketlinkIDM</depends>
+ </local-tx-datasource>
+
+ <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=picketlinkIDM">
+ <attribute name="Database">picketlinkIDM</attribute>
+ <attribute name="InProcessMode">true</attribute>
+ </mbean>
+
+</datasources>
Copied: migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-mssql-ds.xml (from rev 1036, migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mssql-ds.xml)
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-mssql-ds.xml (rev 0)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-mssql-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
+ <connection-url>@jdbc.url@</connection-url>
+ <driver-class>@jdbc.driver@</driver-class>
+ <user-name>@jdbc.username@</user-name>
+ <password>@jdbc.password@</password>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>MS SQLSERVER2000</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+
+</datasources>
Copied: migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-mysql-ds.xml (from rev 1036, migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mysql-ds.xml)
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-mysql-ds.xml (rev 0)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-mysql-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
+
+ <connection-url>@jdbc.url@</connection-url>
+ <driver-class>com.mysql.jdbc.Driver</driver-class>
+
+ <user-name>@jdbc.username@</user-name>
+ <password>@jdbc.password@</password>
+
+ <!-- Typemapping for JBoss 4.0 -->
+ <metadata>
+ <type-mapping>mySQL</type-mapping>
+ </metadata>
+
+ </local-tx-datasource>
+</datasources>
\ No newline at end of file
Copied: migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-oracle-ds.xml (from rev 1036, migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-oracle-ds.xml)
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-oracle-ds.xml (rev 0)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-oracle-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
+ <connection-url>@jdbc.url@</connection-url>
+ <driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
+ <user-name>@jdbc.username@</user-name>
+ <password>@jdbc.password@</password>
+
+ <min-pool-size>5</min-pool-size>
+ <max-pool-size>100</max-pool-size>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>Oracle9i</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+</datasources>
Copied: migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-postgresql-ds.xml (from rev 1036, migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-postgresql-ds.xml)
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-postgresql-ds.xml (rev 0)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-postgresql-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
+ <connection-url>@jdbc.url@</connection-url>
+ <driver-class>org.postgresql.Driver</driver-class>
+ <user-name>@jdbc.username@</user-name>
+ <password>@jdbc.password@</password>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>PostgreSQL 8.0</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+</datasources>
Copied: migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-sybase-ds.xml (from rev 1036, migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-sybase-ds.xml)
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-sybase-ds.xml (rev 0)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/picketlink-idm-sybase-ds.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
+ <connection-url>@jdbc.url@</connection-url>
+ <driver-class>@jdbc.driver@</driver-class>
+ <user-name>@jdbc.username@</user-name>
+ <password>@jdbc.password@</password>
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter</exception-sorter-class-name>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>Sybase</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+</datasources>
+
Modified: migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.cfg.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.cfg.xml 2009-11-19 13:31:09 UTC (rev 1039)
+++ migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.cfg.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://JBossIdentity</id>
Modified: migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.picketlink.idm.cfg.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.picketlink.idm.cfg.xml 2009-11-19 13:31:09 UTC (rev 1039)
+++ migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.picketlink.idm.cfg.xml 2009-11-19 15:07:00 UTC (rev 1040)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://jbpmIdentity</id>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r1039 - in migration/idm/trunk/assembly/src/main/files/jboss: datasources and 1 other directory.
by jboss-identity-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-19 08:31:09 -0500 (Thu, 19 Nov 2009)
New Revision: 1039
Modified:
migration/idm/trunk/assembly/src/main/files/jboss/build.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldb-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldburl-ds.xml
Log:
* renaming on the assembly's hsql DB name.
Modified: migration/idm/trunk/assembly/src/main/files/jboss/build.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/build.xml 2009-11-19 13:26:00 UTC (rev 1038)
+++ migration/idm/trunk/assembly/src/main/files/jboss/build.xml 2009-11-19 13:31:09 UTC (rev 1039)
@@ -39,7 +39,7 @@
<fileset dir="${picketlink.idm.home}/modules/picketlink-idm-service.sar" />
</copy>
- <!-- ### Update the default-jboss-idm.xml #### -->
+ <!-- ### Update the default-picketlink-idm.xml #### -->
<copy file="${picketlink.idm.home}/modules/picketlink-idm-service.sar/META-INF/default-picketlink-idm.xml"
toFile="${jboss.server.config.dir}/deploy/picketlink-idm/picketlink-idm-service.sar/META-INF/default-picketlink-idm.xml"
overwrite="true">
Modified: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldb-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldb-ds.xml 2009-11-19 13:26:00 UTC (rev 1038)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldb-ds.xml 2009-11-19 13:31:09 UTC (rev 1039)
@@ -26,11 +26,11 @@
</metadata>
<!-- ensure the datasource is not initialized before the database itself -->
- <depends>jboss:service=Hypersonic,database=jbossidm</depends>
+ <depends>jboss:service=Hypersonic,database=picketlinkIDM</depends>
</local-tx-datasource>
<mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbossidm">
- <attribute name="Database">jbossidm</attribute>
+ <attribute name="Database">picketlinkIDM</attribute>
<attribute name="InProcessMode">false</attribute>
</mbean>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldburl-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldburl-ds.xml 2009-11-19 13:26:00 UTC (rev 1038)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldburl-ds.xml 2009-11-19 13:31:09 UTC (rev 1039)
@@ -26,11 +26,11 @@
</metadata>
<!-- ensure the datasource is not initialized before the database itself -->
- <depends>jboss:service=Hypersonic,database=jbossidm</depends>
+ <depends>jboss:service=Hypersonic,database=picketlinkIDM</depends>
</local-tx-datasource>
<mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbossidm">
- <attribute name="Database">jbossidm</attribute>
+ <attribute name="Database">picketlinkIDM</attribute>
<attribute name="InProcessMode">true</attribute>
</mbean>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r1038 - migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2.
by jboss-identity-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-19 08:26:00 -0500 (Thu, 19 Nov 2009)
New Revision: 1038
Added:
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateDeployerType.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateInitializerType.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/InitializerType.java
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/OptionType.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionsType.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/SqlInitializerType.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java
Log:
* commit the updated jaxb generate code.
Added: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateDeployerType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateDeployerType.java (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateDeployerType.java 2009-11-19 13:26:00 UTC (rev 1038)
@@ -0,0 +1,125 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.11.19 at 09:03:04 PM CST
+//
+
+
+package org.picketlink.idm.integration.jboss5.jaxb2;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for hibernateDeployerType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="hibernateDeployerType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="hibernateConfiguration" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <choice>
+ * <element name="hibernateSessionFactoryRegistryName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="hibernateSessionFactoryJNDIName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * </choice>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "hibernateDeployerType", propOrder = {
+ "hibernateConfiguration",
+ "hibernateSessionFactoryRegistryName",
+ "hibernateSessionFactoryJNDIName"
+})
+public class HibernateDeployerType {
+
+ @XmlElement(required = true)
+ protected String hibernateConfiguration;
+ protected String hibernateSessionFactoryRegistryName;
+ protected String hibernateSessionFactoryJNDIName;
+
+ /**
+ * Gets the value of the hibernateConfiguration property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getHibernateConfiguration() {
+ return hibernateConfiguration;
+ }
+
+ /**
+ * Sets the value of the hibernateConfiguration property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setHibernateConfiguration(String value) {
+ this.hibernateConfiguration = value;
+ }
+
+ /**
+ * Gets the value of the hibernateSessionFactoryRegistryName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getHibernateSessionFactoryRegistryName() {
+ return hibernateSessionFactoryRegistryName;
+ }
+
+ /**
+ * Sets the value of the hibernateSessionFactoryRegistryName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setHibernateSessionFactoryRegistryName(String value) {
+ this.hibernateSessionFactoryRegistryName = value;
+ }
+
+ /**
+ * Gets the value of the hibernateSessionFactoryJNDIName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getHibernateSessionFactoryJNDIName() {
+ return hibernateSessionFactoryJNDIName;
+ }
+
+ /**
+ * Sets the value of the hibernateSessionFactoryJNDIName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setHibernateSessionFactoryJNDIName(String value) {
+ this.hibernateSessionFactoryJNDIName = value;
+ }
+
+}
Added: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateInitializerType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateInitializerType.java (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateInitializerType.java 2009-11-19 13:26:00 UTC (rev 1038)
@@ -0,0 +1,88 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.11.19 at 09:03:04 PM CST
+//
+
+
+package org.picketlink.idm.integration.jboss5.jaxb2;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for hibernateInitializerType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="hibernateInitializerType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="doChecking" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ * <element name="setupLocation" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "hibernateInitializerType", propOrder = {
+ "doChecking",
+ "setupLocation"
+})
+public class HibernateInitializerType {
+
+ protected boolean doChecking;
+ @XmlElement(required = true)
+ protected String setupLocation;
+
+ /**
+ * Gets the value of the doChecking property.
+ *
+ */
+ public boolean isDoChecking() {
+ return doChecking;
+ }
+
+ /**
+ * Sets the value of the doChecking property.
+ *
+ */
+ public void setDoChecking(boolean value) {
+ this.doChecking = value;
+ }
+
+ /**
+ * Gets the value of the setupLocation property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getSetupLocation() {
+ return setupLocation;
+ }
+
+ /**
+ * Sets the value of the setupLocation property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setSetupLocation(String value) {
+ this.setupLocation = value;
+ }
+
+}
Added: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/InitializerType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/InitializerType.java (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/InitializerType.java 2009-11-19 13:26:00 UTC (rev 1038)
@@ -0,0 +1,125 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.11.19 at 09:03:04 PM CST
+//
+
+
+package org.picketlink.idm.integration.jboss5.jaxb2;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for initializerType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="initializerType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="datasource" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <choice>
+ * <element name="sqlInitializer" type="{urn:picketlink:idm:deployer:v1_0}sqlInitializerType"/>
+ * <element name="hibernateInitializer" type="{urn:picketlink:idm:deployer:v1_0}hibernateInitializerType"/>
+ * </choice>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "initializerType", propOrder = {
+ "datasource",
+ "sqlInitializer",
+ "hibernateInitializer"
+})
+public class InitializerType {
+
+ @XmlElement(required = true)
+ protected String datasource;
+ protected SqlInitializerType sqlInitializer;
+ protected HibernateInitializerType hibernateInitializer;
+
+ /**
+ * Gets the value of the datasource property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getDatasource() {
+ return datasource;
+ }
+
+ /**
+ * Sets the value of the datasource property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setDatasource(String value) {
+ this.datasource = value;
+ }
+
+ /**
+ * Gets the value of the sqlInitializer property.
+ *
+ * @return
+ * possible object is
+ * {@link SqlInitializerType }
+ *
+ */
+ public SqlInitializerType getSqlInitializer() {
+ return sqlInitializer;
+ }
+
+ /**
+ * Sets the value of the sqlInitializer property.
+ *
+ * @param value
+ * allowed object is
+ * {@link SqlInitializerType }
+ *
+ */
+ public void setSqlInitializer(SqlInitializerType value) {
+ this.sqlInitializer = value;
+ }
+
+ /**
+ * Gets the value of the hibernateInitializer property.
+ *
+ * @return
+ * possible object is
+ * {@link HibernateInitializerType }
+ *
+ */
+ public HibernateInitializerType getHibernateInitializer() {
+ return hibernateInitializer;
+ }
+
+ /**
+ * Sets the value of the hibernateInitializer property.
+ *
+ * @param value
+ * allowed object is
+ * {@link HibernateInitializerType }
+ *
+ */
+ public void setHibernateInitializer(HibernateInitializerType value) {
+ this.hibernateInitializer = value;
+ }
+
+}
Added: 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 (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java 2009-11-19 13:26:00 UTC (rev 1038)
@@ -0,0 +1,108 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.11.19 at 09:03:04 PM CST
+//
+
+
+package org.picketlink.idm.integration.jboss5.jaxb2;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.picketlink.idm.integration.jboss5.jaxb2 package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _PicketlinkIdmDeployer_QNAME = new QName("urn:picketlink:idm:deployer:v1_0", "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
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link HibernateInitializerType }
+ *
+ */
+ public HibernateInitializerType createHibernateInitializerType() {
+ return new HibernateInitializerType();
+ }
+
+ /**
+ * Create an instance of {@link InitializerType }
+ *
+ */
+ public InitializerType createInitializerType() {
+ return new InitializerType();
+ }
+
+ /**
+ * Create an instance of {@link OptionsType }
+ *
+ */
+ public OptionsType createOptionsType() {
+ return new OptionsType();
+ }
+
+ /**
+ * Create an instance of {@link HibernateDeployerType }
+ *
+ */
+ public HibernateDeployerType createHibernateDeployerType() {
+ return new HibernateDeployerType();
+ }
+
+ /**
+ * Create an instance of {@link OptionType }
+ *
+ */
+ public OptionType createOptionType() {
+ return new OptionType();
+ }
+
+ /**
+ * Create an instance of {@link PicketlinkIDMDeployerType }
+ *
+ */
+ public PicketlinkIDMDeployerType createPicketlinkIDMDeployerType() {
+ return new PicketlinkIDMDeployerType();
+ }
+
+ /**
+ * Create an instance of {@link SqlInitializerType }
+ *
+ */
+ public SqlInitializerType createSqlInitializerType() {
+ return new SqlInitializerType();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link PicketlinkIDMDeployerType }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "urn:picketlink:idm:deployer:v1_0", name = "picketlink-idm-deployer")
+ public JAXBElement<PicketlinkIDMDeployerType> createPicketlinkIdmDeployer(PicketlinkIDMDeployerType value) {
+ return new JAXBElement<PicketlinkIDMDeployerType>(_PicketlinkIdmDeployer_QNAME, PicketlinkIDMDeployerType.class, null, value);
+ }
+
+}
Added: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionType.java (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionType.java 2009-11-19 13:26:00 UTC (rev 1038)
@@ -0,0 +1,97 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.11.19 at 09:03:04 PM CST
+//
+
+
+package org.picketlink.idm.integration.jboss5.jaxb2;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for optionType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="optionType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="value" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "optionType", propOrder = {
+ "name",
+ "value"
+})
+public class OptionType {
+
+ @XmlElement(required = true)
+ protected String name;
+ @XmlElement(required = true)
+ protected String value;
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ /**
+ * Gets the value of the value property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
Added: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionsType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionsType.java (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionsType.java 2009-11-19 13:26:00 UTC (rev 1038)
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.11.19 at 09:03:04 PM CST
+//
+
+
+package org.picketlink.idm.integration.jboss5.jaxb2;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for optionsType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="optionsType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="option" type="{urn:picketlink:idm:deployer:v1_0}optionType" maxOccurs="unbounded"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "optionsType", propOrder = {
+ "option"
+})
+public class OptionsType {
+
+ @XmlElement(required = true)
+ protected List<OptionType> option;
+
+ /**
+ * Gets the value of the option property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the option property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getOption().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link OptionType }
+ *
+ *
+ */
+ public List<OptionType> getOption() {
+ if (option == null) {
+ option = new ArrayList<OptionType>();
+ }
+ return this.option;
+ }
+
+}
Added: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/SqlInitializerType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/SqlInitializerType.java (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/SqlInitializerType.java 2009-11-19 13:26:00 UTC (rev 1038)
@@ -0,0 +1,97 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.11.19 at 09:03:04 PM CST
+//
+
+
+package org.picketlink.idm.integration.jboss5.jaxb2;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for sqlInitializerType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="sqlInitializerType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="sqlFile" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="exitSQL" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sqlInitializerType", propOrder = {
+ "sqlFile",
+ "exitSQL"
+})
+public class SqlInitializerType {
+
+ @XmlElement(required = true)
+ protected String sqlFile;
+ @XmlElement(required = true)
+ protected String exitSQL;
+
+ /**
+ * Gets the value of the sqlFile property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getSqlFile() {
+ return sqlFile;
+ }
+
+ /**
+ * Sets the value of the sqlFile property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setSqlFile(String value) {
+ this.sqlFile = value;
+ }
+
+ /**
+ * Gets the value of the exitSQL property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getExitSQL() {
+ return exitSQL;
+ }
+
+ /**
+ * Sets the value of the exitSQL property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setExitSQL(String value) {
+ this.exitSQL = value;
+ }
+
+}
Added: 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 (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java 2009-11-19 13:26:00 UTC (rev 1038)
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.11.19 at 09:03:04 PM CST
+//
+
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:picketlink:idm:deployer:v1_0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.picketlink.idm.integration.jboss5.jaxb2;
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r1037 - in migration/idm/trunk/integration: deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2 and 4 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-19 08:24:34 -0500 (Thu, 19 Nov 2009)
New Revision: 1037
Added:
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/PicketlinkIDMDeployerType.java
Removed:
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateDeployerType.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateInitializerType.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/InitializerType.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/JbossIDMDeployerType.java
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/OptionType.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionsType.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/SqlInitializerType.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java
Modified:
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMConfigParsingDeployer.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMDeployer.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMMetadata.java
migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/JAXB2IdentityDeployerConfiguration.java
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/deployer-assembly.xml
migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd
migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml
migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml
Log:
* update on the identity-deployer.xsd.
Modified: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMConfigParsingDeployer.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMConfigParsingDeployer.java 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMConfigParsingDeployer.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -7,8 +7,8 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.picketlink.idm.integration.jboss5.jaxb2.JbossIDMDeployerType;
import org.jboss.virtual.VirtualFile;
+import org.picketlink.idm.integration.jboss5.jaxb2.PicketlinkIDMDeployerType;
/**
* IDMConfigParsingDeployer is picking up the *-jboss-idm.xml files, produce the {@link IDMMetadata} Object, which will be used in the
@@ -32,7 +32,7 @@
IDMMetadata metaData = new IDMMetadata();
metaData.setDeployerFileName(file.getPathName());
- JbossIDMDeployerType deployerMetadata = JAXB2IdentityDeployerConfiguration.createDeployerConfiguration(file.openStream());
+ PicketlinkIDMDeployerType deployerMetadata = JAXB2IdentityDeployerConfiguration.createDeployerConfiguration(file.openStream());
metaData.setDeploperType(deployerMetadata);
logger.fine("the configuration file path name is: [" + file.getPathName() + "]");
Modified: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMDeployer.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMDeployer.java 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMDeployer.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -9,7 +9,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.picketlink.idm.integration.jboss5.jaxb2.InitializerType;
-import org.picketlink.idm.integration.jboss5.jaxb2.JbossIDMDeployerType;
+import org.picketlink.idm.integration.jboss5.jaxb2.PicketlinkIDMDeployerType;
/**
@@ -34,7 +34,7 @@
@Override
public void deploy(VFSDeploymentUnit deploymentUnit, IDMMetadata metadata) throws DeploymentException {
- JbossIDMDeployerType config = metadata.getDeploperType();
+ PicketlinkIDMDeployerType config = metadata.getDeploperType();
service = new IDMService(config.getIdmConfigFile());
if (transactionManager != null) {
service.setTransactionManager(transactionManager);
Modified: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMMetadata.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMMetadata.java 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMMetadata.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -3,10 +3,10 @@
*/
package org.picketlink.idm.integration.jboss5;
+import org.picketlink.idm.integration.jboss5.jaxb2.PicketlinkIDMDeployerType;
+
import java.io.Serializable;
-import org.picketlink.idm.integration.jboss5.jaxb2.JbossIDMDeployerType;
-
/**
*
*
@@ -17,15 +17,15 @@
private static final long serialVersionUID = -3236524660920273677L;
- private JbossIDMDeployerType deployerType;
+ private PicketlinkIDMDeployerType deployerType;
private String deployerFileName;
- public JbossIDMDeployerType getDeploperType() {
+ public PicketlinkIDMDeployerType getDeploperType() {
return deployerType;
}
- public void setDeploperType(JbossIDMDeployerType deployerType) {
+ public void setDeploperType(PicketlinkIDMDeployerType deployerType) {
this.deployerType = deployerType;
}
Modified: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/JAXB2IdentityDeployerConfiguration.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/JAXB2IdentityDeployerConfiguration.java 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/JAXB2IdentityDeployerConfiguration.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -16,7 +16,7 @@
import org.picketlink.idm.common.exception.IdentityConfigurationException;
import org.picketlink.idm.impl.helper.SecurityActions;
-import org.picketlink.idm.integration.jboss5.jaxb2.JbossIDMDeployerType;
+import org.picketlink.idm.integration.jboss5.jaxb2.PicketlinkIDMDeployerType;
/**
* @author Jeff Yu
@@ -27,17 +27,17 @@
private static final Logger logger = Logger.getLogger(JAXB2IdentityDeployerConfiguration.class.getName());
@SuppressWarnings({"unchecked"})
- public static JbossIDMDeployerType createDeployerConfiguration(InputStream inputStream) throws Exception {
+ public static PicketlinkIDMDeployerType createDeployerConfiguration(InputStream inputStream) throws Exception {
if (inputStream == null) {
throw new NullPointerException("deployer configuration is null");
}
- JAXBElement<JbossIDMDeployerType> deployerType = null;
+ JAXBElement<PicketlinkIDMDeployerType> deployerType = null;
try {
JAXBContext jaxbContext = JAXBContext.newInstance("org.picketlink.idm.integration.jboss5.jaxb2");
Unmarshaller unMarshaller = jaxbContext.createUnmarshaller();
- deployerType = (JAXBElement<JbossIDMDeployerType>)unMarshaller.unmarshal(inputStream);
+ deployerType = (JAXBElement<PicketlinkIDMDeployerType>)unMarshaller.unmarshal(inputStream);
}catch (JAXBException e) {
logger.severe(e.getMessage());
@@ -51,7 +51,7 @@
}
- public static JbossIDMDeployerType createDeployerConfiguration(File file) throws Exception {
+ public static PicketlinkIDMDeployerType createDeployerConfiguration(File file) throws Exception {
if (file == null)
{
throw new NullPointerException("Identity deployer file is null");
@@ -69,7 +69,7 @@
}
- public static JbossIDMDeployerType createDeployerConfiguration(String file) throws Exception {
+ public static PicketlinkIDMDeployerType createDeployerConfiguration(String file) throws Exception {
ClassLoader classLoader = SecurityActions.getContextClassLoader();
InputStream inputStream = classLoader.getResourceAsStream(file);
if (inputStream == null)
Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateDeployerType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateDeployerType.java 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateDeployerType.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -1,125 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2009.05.28 at 11:27:34 PM CST
-//
-
-
-package org.picketlink.idm.integration.jboss5.jaxb2;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for hibernateDeployerType complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="hibernateDeployerType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="hibernateConfiguration" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <choice>
- * <element name="hibernateSessionFactoryRegistryName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="hibernateSessionFactoryJNDIName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * </choice>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "hibernateDeployerType", propOrder = {
- "hibernateConfiguration",
- "hibernateSessionFactoryRegistryName",
- "hibernateSessionFactoryJNDIName"
-})
-public class HibernateDeployerType {
-
- @XmlElement(required = true)
- protected String hibernateConfiguration;
- protected String hibernateSessionFactoryRegistryName;
- protected String hibernateSessionFactoryJNDIName;
-
- /**
- * Gets the value of the hibernateConfiguration property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getHibernateConfiguration() {
- return hibernateConfiguration;
- }
-
- /**
- * Sets the value of the hibernateConfiguration property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setHibernateConfiguration(String value) {
- this.hibernateConfiguration = value;
- }
-
- /**
- * Gets the value of the hibernateSessionFactoryRegistryName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getHibernateSessionFactoryRegistryName() {
- return hibernateSessionFactoryRegistryName;
- }
-
- /**
- * Sets the value of the hibernateSessionFactoryRegistryName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setHibernateSessionFactoryRegistryName(String value) {
- this.hibernateSessionFactoryRegistryName = value;
- }
-
- /**
- * Gets the value of the hibernateSessionFactoryJNDIName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getHibernateSessionFactoryJNDIName() {
- return hibernateSessionFactoryJNDIName;
- }
-
- /**
- * Sets the value of the hibernateSessionFactoryJNDIName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setHibernateSessionFactoryJNDIName(String value) {
- this.hibernateSessionFactoryJNDIName = value;
- }
-
-}
Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateInitializerType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateInitializerType.java 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateInitializerType.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -1,88 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2009.05.28 at 11:27:34 PM CST
-//
-
-
-package org.picketlink.idm.integration.jboss5.jaxb2;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for hibernateInitializerType complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="hibernateInitializerType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="doChecking" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- * <element name="setupLocation" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "hibernateInitializerType", propOrder = {
- "doChecking",
- "setupLocation"
-})
-public class HibernateInitializerType {
-
- protected boolean doChecking;
- @XmlElement(required = true)
- protected String setupLocation;
-
- /**
- * Gets the value of the doChecking property.
- *
- */
- public boolean isDoChecking() {
- return doChecking;
- }
-
- /**
- * Sets the value of the doChecking property.
- *
- */
- public void setDoChecking(boolean value) {
- this.doChecking = value;
- }
-
- /**
- * Gets the value of the setupLocation property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSetupLocation() {
- return setupLocation;
- }
-
- /**
- * Sets the value of the setupLocation property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSetupLocation(String value) {
- this.setupLocation = value;
- }
-
-}
Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/InitializerType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/InitializerType.java 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/InitializerType.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -1,125 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2009.05.28 at 11:27:34 PM CST
-//
-
-
-package org.picketlink.idm.integration.jboss5.jaxb2;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for initializerType complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="initializerType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="datasource" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <choice>
- * <element name="sqlInitializer" type="{urn:jboss:identity:idm:deployer:v1_0_beta}sqlInitializerType"/>
- * <element name="hibernateInitializer" type="{urn:jboss:identity:idm:deployer:v1_0_beta}hibernateInitializerType"/>
- * </choice>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "initializerType", propOrder = {
- "datasource",
- "sqlInitializer",
- "hibernateInitializer"
-})
-public class InitializerType {
-
- @XmlElement(required = true)
- protected String datasource;
- protected SqlInitializerType sqlInitializer;
- protected HibernateInitializerType hibernateInitializer;
-
- /**
- * Gets the value of the datasource property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDatasource() {
- return datasource;
- }
-
- /**
- * Sets the value of the datasource property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDatasource(String value) {
- this.datasource = value;
- }
-
- /**
- * Gets the value of the sqlInitializer property.
- *
- * @return
- * possible object is
- * {@link SqlInitializerType }
- *
- */
- public SqlInitializerType getSqlInitializer() {
- return sqlInitializer;
- }
-
- /**
- * Sets the value of the sqlInitializer property.
- *
- * @param value
- * allowed object is
- * {@link SqlInitializerType }
- *
- */
- public void setSqlInitializer(SqlInitializerType value) {
- this.sqlInitializer = value;
- }
-
- /**
- * Gets the value of the hibernateInitializer property.
- *
- * @return
- * possible object is
- * {@link HibernateInitializerType }
- *
- */
- public HibernateInitializerType getHibernateInitializer() {
- return hibernateInitializer;
- }
-
- /**
- * Sets the value of the hibernateInitializer property.
- *
- * @param value
- * allowed object is
- * {@link HibernateInitializerType }
- *
- */
- public void setHibernateInitializer(HibernateInitializerType value) {
- this.hibernateInitializer = value;
- }
-
-}
Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/JbossIDMDeployerType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/JbossIDMDeployerType.java 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/JbossIDMDeployerType.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -1,212 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2009.05.28 at 11:27:34 PM CST
-//
-
-
-package org.picketlink.idm.integration.jboss5.jaxb2;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for jbossIDMDeployerType complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="jbossIDMDeployerType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="JNDIName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="idmConfigFile" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="hibernateDeployer" type="{urn:jboss:identity:idm:deployer:v1_0_beta}hibernateDeployerType" minOccurs="0"/>
- * <element name="initializers" type="{urn:jboss:identity:idm:deployer:v1_0_beta}initializerType" minOccurs="0"/>
- * <element name="options" type="{urn:jboss:identity:idm:deployer:v1_0_beta}optionsType" minOccurs="0"/>
- * <element name="depends" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "jbossIDMDeployerType", propOrder = {
- "jndiName",
- "idmConfigFile",
- "hibernateDeployer",
- "initializers",
- "options",
- "depends"
-})
-public class JbossIDMDeployerType {
-
- @XmlElement(name = "JNDIName", required = true)
- protected String jndiName;
- @XmlElement(required = true)
- protected String idmConfigFile;
- protected HibernateDeployerType hibernateDeployer;
- protected InitializerType initializers;
- protected OptionsType options;
- protected List<String> depends;
-
- /**
- * Gets the value of the jndiName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getJNDIName() {
- return jndiName;
- }
-
- /**
- * Sets the value of the jndiName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setJNDIName(String value) {
- this.jndiName = value;
- }
-
- /**
- * Gets the value of the idmConfigFile property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getIdmConfigFile() {
- return idmConfigFile;
- }
-
- /**
- * Sets the value of the idmConfigFile property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setIdmConfigFile(String value) {
- this.idmConfigFile = value;
- }
-
- /**
- * Gets the value of the hibernateDeployer property.
- *
- * @return
- * possible object is
- * {@link HibernateDeployerType }
- *
- */
- public HibernateDeployerType getHibernateDeployer() {
- return hibernateDeployer;
- }
-
- /**
- * Sets the value of the hibernateDeployer property.
- *
- * @param value
- * allowed object is
- * {@link HibernateDeployerType }
- *
- */
- public void setHibernateDeployer(HibernateDeployerType value) {
- this.hibernateDeployer = value;
- }
-
- /**
- * Gets the value of the initializers property.
- *
- * @return
- * possible object is
- * {@link InitializerType }
- *
- */
- public InitializerType getInitializers() {
- return initializers;
- }
-
- /**
- * Sets the value of the initializers property.
- *
- * @param value
- * allowed object is
- * {@link InitializerType }
- *
- */
- public void setInitializers(InitializerType value) {
- this.initializers = value;
- }
-
- /**
- * Gets the value of the options property.
- *
- * @return
- * possible object is
- * {@link OptionsType }
- *
- */
- public OptionsType getOptions() {
- return options;
- }
-
- /**
- * Sets the value of the options property.
- *
- * @param value
- * allowed object is
- * {@link OptionsType }
- *
- */
- public void setOptions(OptionsType value) {
- this.options = value;
- }
-
- /**
- * Gets the value of the depends property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the depends property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDepends().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link String }
- *
- *
- */
- public List<String> getDepends() {
- if (depends == null) {
- depends = new ArrayList<String>();
- }
- return this.depends;
- }
-
-}
Deleted: 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 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -1,108 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2009.05.28 at 11:27:34 PM CST
-//
-
-
-package org.picketlink.idm.integration.jboss5.jaxb2;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.picketlink.idm.integration.jboss5.jaxb2 package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
-@XmlRegistry
-public class ObjectFactory {
-
- private final static QName _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
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link OptionType }
- *
- */
- public OptionType createOptionType() {
- return new OptionType();
- }
-
- /**
- * Create an instance of {@link OptionsType }
- *
- */
- public OptionsType createOptionsType() {
- return new OptionsType();
- }
-
- /**
- * Create an instance of {@link JbossIDMDeployerType }
- *
- */
- public JbossIDMDeployerType createJbossIDMDeployerType() {
- return new JbossIDMDeployerType();
- }
-
- /**
- * Create an instance of {@link InitializerType }
- *
- */
- public InitializerType createInitializerType() {
- return new InitializerType();
- }
-
- /**
- * Create an instance of {@link HibernateDeployerType }
- *
- */
- public HibernateDeployerType createHibernateDeployerType() {
- return new HibernateDeployerType();
- }
-
- /**
- * Create an instance of {@link SqlInitializerType }
- *
- */
- public SqlInitializerType createSqlInitializerType() {
- return new SqlInitializerType();
- }
-
- /**
- * Create an instance of {@link HibernateInitializerType }
- *
- */
- public HibernateInitializerType createHibernateInitializerType() {
- return new HibernateInitializerType();
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link JbossIDMDeployerType }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "urn:jboss:identity:idm:deployer:v1_0_beta", name = "jboss-idm-deployer")
- public JAXBElement<JbossIDMDeployerType> createJbossIdmDeployer(JbossIDMDeployerType value) {
- return new JAXBElement<JbossIDMDeployerType>(_JbossIdmDeployer_QNAME, JbossIDMDeployerType.class, null, value);
- }
-
-}
Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionType.java 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionType.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -1,97 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2009.05.28 at 11:27:34 PM CST
-//
-
-
-package org.picketlink.idm.integration.jboss5.jaxb2;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for optionType complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="optionType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="value" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "optionType", propOrder = {
- "name",
- "value"
-})
-public class OptionType {
-
- @XmlElement(required = true)
- protected String name;
- @XmlElement(required = true)
- protected String value;
-
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- return name;
- }
-
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
-
- /**
- * Gets the value of the value property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setValue(String value) {
- this.value = value;
- }
-
-}
Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionsType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionsType.java 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionsType.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -1,76 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2009.05.28 at 11:27:34 PM CST
-//
-
-
-package org.picketlink.idm.integration.jboss5.jaxb2;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for optionsType complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="optionsType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="option" type="{urn:jboss:identity:idm:deployer:v1_0_beta}optionType" maxOccurs="unbounded"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "optionsType", propOrder = {
- "option"
-})
-public class OptionsType {
-
- @XmlElement(required = true)
- protected List<OptionType> option;
-
- /**
- * Gets the value of the option property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the option property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getOption().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link OptionType }
- *
- *
- */
- public List<OptionType> getOption() {
- if (option == null) {
- option = new ArrayList<OptionType>();
- }
- return this.option;
- }
-
-}
Added: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/PicketlinkIDMDeployerType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/PicketlinkIDMDeployerType.java (rev 0)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/PicketlinkIDMDeployerType.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -0,0 +1,212 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.11.19 at 09:03:04 PM CST
+//
+
+
+package org.picketlink.idm.integration.jboss5.jaxb2;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for picketlinkIDMDeployerType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="picketlinkIDMDeployerType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="JNDIName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="idmConfigFile" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="hibernateDeployer" type="{urn:picketlink:idm:deployer:v1_0}hibernateDeployerType" minOccurs="0"/>
+ * <element name="initializers" type="{urn:picketlink:idm:deployer:v1_0}initializerType" minOccurs="0"/>
+ * <element name="options" type="{urn:picketlink:idm:deployer:v1_0}optionsType" minOccurs="0"/>
+ * <element name="depends" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "picketlinkIDMDeployerType", propOrder = {
+ "jndiName",
+ "idmConfigFile",
+ "hibernateDeployer",
+ "initializers",
+ "options",
+ "depends"
+})
+public class PicketlinkIDMDeployerType {
+
+ @XmlElement(name = "JNDIName", required = true)
+ protected String jndiName;
+ @XmlElement(required = true)
+ protected String idmConfigFile;
+ protected HibernateDeployerType hibernateDeployer;
+ protected InitializerType initializers;
+ protected OptionsType options;
+ protected List<String> depends;
+
+ /**
+ * Gets the value of the jndiName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getJNDIName() {
+ return jndiName;
+ }
+
+ /**
+ * Sets the value of the jndiName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setJNDIName(String value) {
+ this.jndiName = value;
+ }
+
+ /**
+ * Gets the value of the idmConfigFile property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getIdmConfigFile() {
+ return idmConfigFile;
+ }
+
+ /**
+ * Sets the value of the idmConfigFile property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setIdmConfigFile(String value) {
+ this.idmConfigFile = value;
+ }
+
+ /**
+ * Gets the value of the hibernateDeployer property.
+ *
+ * @return
+ * possible object is
+ * {@link HibernateDeployerType }
+ *
+ */
+ public HibernateDeployerType getHibernateDeployer() {
+ return hibernateDeployer;
+ }
+
+ /**
+ * Sets the value of the hibernateDeployer property.
+ *
+ * @param value
+ * allowed object is
+ * {@link HibernateDeployerType }
+ *
+ */
+ public void setHibernateDeployer(HibernateDeployerType value) {
+ this.hibernateDeployer = value;
+ }
+
+ /**
+ * Gets the value of the initializers property.
+ *
+ * @return
+ * possible object is
+ * {@link InitializerType }
+ *
+ */
+ public InitializerType getInitializers() {
+ return initializers;
+ }
+
+ /**
+ * Sets the value of the initializers property.
+ *
+ * @param value
+ * allowed object is
+ * {@link InitializerType }
+ *
+ */
+ public void setInitializers(InitializerType value) {
+ this.initializers = value;
+ }
+
+ /**
+ * Gets the value of the options property.
+ *
+ * @return
+ * possible object is
+ * {@link OptionsType }
+ *
+ */
+ public OptionsType getOptions() {
+ return options;
+ }
+
+ /**
+ * Sets the value of the options property.
+ *
+ * @param value
+ * allowed object is
+ * {@link OptionsType }
+ *
+ */
+ public void setOptions(OptionsType value) {
+ this.options = value;
+ }
+
+ /**
+ * Gets the value of the depends property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the depends property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getDepends().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link String }
+ *
+ *
+ */
+ public List<String> getDepends() {
+ if (depends == null) {
+ depends = new ArrayList<String>();
+ }
+ return this.depends;
+ }
+
+}
Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/SqlInitializerType.java
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/SqlInitializerType.java 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/SqlInitializerType.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -1,97 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2009.05.28 at 11:27:34 PM CST
-//
-
-
-package org.picketlink.idm.integration.jboss5.jaxb2;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for sqlInitializerType complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="sqlInitializerType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="sqlFile" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="exitSQL" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "sqlInitializerType", propOrder = {
- "sqlFile",
- "exitSQL"
-})
-public class SqlInitializerType {
-
- @XmlElement(required = true)
- protected String sqlFile;
- @XmlElement(required = true)
- protected String exitSQL;
-
- /**
- * Gets the value of the sqlFile property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSqlFile() {
- return sqlFile;
- }
-
- /**
- * Sets the value of the sqlFile property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSqlFile(String value) {
- this.sqlFile = value;
- }
-
- /**
- * Gets the value of the exitSQL property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getExitSQL() {
- return exitSQL;
- }
-
- /**
- * Sets the value of the exitSQL property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setExitSQL(String value) {
- this.exitSQL = value;
- }
-
-}
Deleted: 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 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java 2009-11-19 13:24:34 UTC (rev 1037)
@@ -1,9 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2009.05.28 at 11:27:34 PM CST
-//
-
-(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;
Modified: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml 2009-11-19 13:24:34 UTC (rev 1037)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta"
+<picketlink-idm-deployer xmlns="urn:picketlink:idm:deployer:v1_0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd">
+ xsi:schemaLocation="urn:picketlink:idm:deployer:v1_0 identity-deployer.xsd">
<JNDIName>java:/IdentitySessionFactory</JNDIName>
<idmConfigFile>picketlink.idm.cfg.xml</idmConfigFile>
<hibernateDeployer>
@@ -18,4 +18,4 @@
<doChecking>true</doChecking>
</hibernateInitializer-->
</initializers>
-</jboss-idm-deployer>
+</picketlink-idm-deployer>
Modified: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml 2009-11-19 13:24:34 UTC (rev 1037)
@@ -8,7 +8,7 @@
<bean name="org.picketlink.idm:service=MetaDataDeployer"
class="org.picketlink.idm.integration.jboss5.IDMConfigParsingDeployer">
- <property name="suffix">-jboss-idm.xml</property>
+ <property name="suffix">-picketlink-idm.xml</property>
<property name="allowMultipleFiles">true</property>
</bean>
Modified: migration/idm/trunk/integration/deployer/src/main/resources/deployer-assembly.xml
===================================================================
--- migration/idm/trunk/integration/deployer/src/main/resources/deployer-assembly.xml 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/resources/deployer-assembly.xml 2009-11-19 13:24:34 UTC (rev 1037)
@@ -10,7 +10,7 @@
<directory>${project.build.outputDirectory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>META-INF/idm-deployer-jboss-beans.xml</include>
+ <include>META-INF/picketlink-idm-deployer-jboss-beans.xml</include>
<include>identity-deployer.xsd</include>
</includes>
</fileSet>
@@ -20,16 +20,16 @@
<dependencySet>
<outputDirectory>/</outputDirectory>
<includes>
- <include>org.picketlink.idm.integration:idm-jboss5-deployer</include>
- <include>org.picketlink.idm.integration:idm-jboss5</include>
- <include>org.picketlink.idm:idm-ldap</include>
- <include>org.picketlink.idm:idm-hibernate</include>
- <include>org.picketlink.idm:idm-core</include>
- <include>org.picketlink.idm:idm-api</include>
- <include>org.picketlink.idm:idm-common</include>
- <include>org.picketlink.idm:idm-spi</include>
- <include>org.picketlink.idm:idm-auth</include>
- <include>org.picketlink.idm:idm-cache</include>
+ <include>org.picketlink.idm.integration:picketlink-idm-jboss5-deployer</include>
+ <include>org.picketlink.idm.integration:picketlink-idm-jboss5</include>
+ <include>org.picketlink.idm:picketlink-idm-ldap</include>
+ <include>org.picketlink.idm:picketlink-idm-hibernate</include>
+ <include>org.picketlink.idm:picketlink-idm-core</include>
+ <include>org.picketlink.idm:picketlink-idm-api</include>
+ <include>org.picketlink.idm:picketlink-idm-common</include>
+ <include>org.picketlink.idm:picketlink-idm-spi</include>
+ <include>org.picketlink.idm:picketlink-idm-auth</include>
+ <include>org.picketlink.idm:picketlink-idm-cache</include>
</includes>
</dependencySet>
</dependencySets>
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 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd 2009-11-19 13:24:34 UTC (rev 1037)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:picketlink:idm:deployer:v1_0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="picketlink-idm-deployer" type="urn:picketlinkIDMDeployerType" xmlns:urn="urn:picketlink:idm:deployer:v1_0">
<xs:annotation>
- <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:documentation><xs:schemaattributeFormDefault="unqualified"elementFormDefault="qualified"xmlns:xs="http://www.w3.org/2001/XMLSchema"targetNamespace="urn:picketlink:idm:deployer:v1_0"xmlns="urn:picketlink:idm:deployer:v1_0"xmlns:xml="http://www.w3.org/XML/1998/namespace"xmlns:wcc="urn:picket:idm:deployer:v1_0"></xs:documentation>
</xs:annotation>
</xs:element>
@@ -10,9 +10,9 @@
<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: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="hibernateDeployer" minOccurs="0" type="urn:hibernateDeployerType" xmlns:urn="urn:picketlink:idm:deployer:v1_0"/>
+ <xs:element name="initializers" minOccurs="0" type="urn:initializerType" xmlns:urn="urn:picketlink:idm:deployer:v1_0"/>
+ <xs:element name="options" minOccurs="0" type="urn:optionsType" xmlns:urn="urn:picketlink:idm:deployer:v1_0"/>
<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: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:element name="sqlInitializer" type="urn:sqlInitializerType" xmlns:urn="urn:picketlink:idm:deployer:v1_0" />
+ <xs:element name="hibernateInitializer" type="urn:hibernateInitializerType" xmlns:urn="urn:picketlink:idm:deployer:v1_0" />
</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:org:picketlink:idm:deployer:v1_0_CR1" maxOccurs="unbounded" />
+ <xs:element name="option" type="urn:optionType" xmlns:urn="urn:picketlink:idm:deployer:v1_0" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
Modified: 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/META-INF/jbpm-picketlink-idm.xml 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml 2009-11-19 13:24:34 UTC (rev 1037)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta"
+<picketlink-idm-deployer xmlns="urn:picketlink:idm:deployer:v1_0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd">
+ xsi:schemaLocation="urn:picketlink:idm:deployer:v1_0 identity-deployer.xsd">
<JNDIName>java:/jbpmIdentitySessionFactory</JNDIName>
- <idmConfigFile>jbpm.idm.cfg.xml</idmConfigFile>
-</jboss-idm-deployer>
+ <idmConfigFile>jbpm.picketlink.idm.cfg.xml</idmConfigFile>
+</picketlink-idm-deployer>
Modified: migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml
===================================================================
--- migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml 2009-11-19 12:17:30 UTC (rev 1036)
+++ migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml 2009-11-19 13:24:34 UTC (rev 1037)
@@ -12,9 +12,9 @@
</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="datasource">java:PicketLinkIDMDS</property>
<property name="exitSQL">select * from jbid_io</property>
- <depends>jboss.jca:service=DataSourceBinding,name=jbossidmDS</depends>
+ <depends>jboss.jca:service=DataSourceBinding,name=PicketLinkIDMDS</depends>
</bean>
</deployment>
\ No newline at end of file
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r1036 - migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/datasources.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-19 07:17:30 -0500 (Thu, 19 Nov 2009)
New Revision: 1036
Modified:
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/datasources/directories.xml
Log:
update msad config
Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/datasources/directories.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/datasources/directories.xml 2009-11-19 12:00:07 UTC (rev 1035)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/datasources/directories.xml 2009-11-19 12:17:30 UTC (rev 1036)
@@ -130,16 +130,13 @@
<directory>
<directory-name>MSAD-2k8</directory-name>
<description>ldap://vmg13.mw.lab.eng.bos.redhat.com:389</description>
-
<config-file>test-identity-config-msad-2k8.xml</config-file>
- <host>dev44.qa.atl.jboss.com</host>
+ <host>vmg13.mw.lab.eng.bos.redhat.com</host>
<port>389</port>
<context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory>
<admin-dn>JBOSS0\jbossqa</admin-dn>
<admin-password>jboss42</admin-password>
-
<populate-ldif>ldap/initial-empty-msad.ldif</populate-ldif>
-
<cleanup-dn>o=jbid,dc=jboss,dc=test</cleanup-dn>
</directory>
<directory>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r1035 - in migration/idm/trunk: example/simple/src/test/resources and 6 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-11-19 07:00:07 -0500 (Thu, 19 Nov 2009)
New Revision: 1035
Added:
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k3.xml
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k8.xml
Removed:
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/dev44-msad.truststore
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad.xml
Modified:
migration/idm/trunk/example/auth/src/main/resources/jboss.idm.cfg.xml
migration/idm/trunk/example/simple/src/test/resources/example-db-config.xml
migration/idm/trunk/example/simple/src/test/resources/example-db-inject-sf-config.xml
migration/idm/trunk/example/simple/src/test/resources/example-ldap-config.xml
migration/idm/trunk/example/simple/src/test/resources/example-mixed-config.xml
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/AttributesType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityObjectTypeType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingsType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoresType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityTypeMappingsType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/JbossIdentityType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/ObjectFactory.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/OptionsType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmsType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RelationshipsType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoriesType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoryType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/StoresType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/SupportedIdentityObjectTypesType.java
migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/package-info.java
migration/idm/trunk/picketlink-idm-core/src/test/resources/example-db-config.xml
migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xml
migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xsd
migration/idm/trunk/picketlink-idm-core/src/test/resources/store-test-config.xml
migration/idm/trunk/picketlink-idm-core/src/test/resources/test-config.xml
migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml
migration/idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/datasources/directories.xml
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/identity-config.xsd
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/minimal-flexible-identity-config.xml
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/store-test-config.xml
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-local.xml
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends12.xml
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends20.xml
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml
migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml
Log:
rename namespace and add MSAD 2k8
Modified: migration/idm/trunk/example/auth/src/main/resources/jboss.idm.cfg.xml
===================================================================
--- migration/idm/trunk/example/auth/src/main/resources/jboss.idm.cfg.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/example/auth/src/main/resources/jboss.idm.cfg.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://JBossIdentity</id>
Modified: migration/idm/trunk/example/simple/src/test/resources/example-db-config.xml
===================================================================
--- migration/idm/trunk/example/simple/src/test/resources/example-db-config.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/example/simple/src/test/resources/example-db-config.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://JBossIdentityExample/SampleRealm</id>
Modified: migration/idm/trunk/example/simple/src/test/resources/example-db-inject-sf-config.xml
===================================================================
--- migration/idm/trunk/example/simple/src/test/resources/example-db-inject-sf-config.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/example/simple/src/test/resources/example-db-inject-sf-config.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://JBossIdentityExample/SampleRealm</id>
Modified: migration/idm/trunk/example/simple/src/test/resources/example-ldap-config.xml
===================================================================
--- migration/idm/trunk/example/simple/src/test/resources/example-ldap-config.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/example/simple/src/test/resources/example-ldap-config.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://JBossIdentityExample/SampleRealm</id>
Modified: migration/idm/trunk/example/simple/src/test/resources/example-mixed-config.xml
===================================================================
--- migration/idm/trunk/example/simple/src/test/resources/example-mixed-config.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/example/simple/src/test/resources/example-mixed-config.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://JBossIdentityExample/SampleRealm</id>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/AttributesType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/AttributesType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/AttributesType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -25,7 +25,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="attribute" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}attributeType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="attribute" type="{urn:picketlink:idm:config:v1_0_0_cr1}attributeType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityObjectTypeType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityObjectTypeType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityObjectTypeType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -32,7 +32,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="relationship" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}relationshipType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="relationship" type="{urn:picketlink:idm:config:v1_0_0_cr1}relationshipType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
@@ -54,7 +54,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="attribute" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}attributeType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="attribute" type="{urn:picketlink:idm:config:v1_0_0_cr1}attributeType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
@@ -65,7 +65,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="option" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="option" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
@@ -231,7 +231,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="attribute" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}attributeType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="attribute" type="{urn:picketlink:idm:config:v1_0_0_cr1}attributeType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
@@ -350,7 +350,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="option" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="option" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
@@ -409,7 +409,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="relationship" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}relationshipType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="relationship" type="{urn:picketlink:idm:config:v1_0_0_cr1}relationshipType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -25,8 +25,8 @@
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
* <element name="identity-store-id" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="identity-object-types" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-object-typesType"/>
- * <element name="options" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionsType"/>
+ * <element name="identity-object-types" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-object-typesType"/>
+ * <element name="options" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionsType"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingsType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingsType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingsType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -26,7 +26,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="identity-store-mapping" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-store-mappingType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="identity-store-mapping" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-store-mappingType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -28,15 +28,15 @@
* <sequence>
* <element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/>
* <element name="class" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="external-config" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}external-configType"/>
- * <element name="supported-relationship-types" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}supported-relationship-typesType"/>
- * <element name="supported-identity-object-types" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}supported-identity-object-typesType"/>
+ * <element name="external-config" type="{urn:picketlink:idm:config:v1_0_0_cr1}external-configType"/>
+ * <element name="supported-relationship-types" type="{urn:picketlink:idm:config:v1_0_0_cr1}supported-relationship-typesType"/>
+ * <element name="supported-identity-object-types" type="{urn:picketlink:idm:config:v1_0_0_cr1}supported-identity-object-typesType"/>
* <element name="options">
* <complexType>
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="option" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="option" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
@@ -229,7 +229,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="option" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="option" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoresType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoresType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoresType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -26,7 +26,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="identity-store" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-storeType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="identity-store" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-storeType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityTypeMappingsType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityTypeMappingsType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityTypeMappingsType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -27,7 +27,7 @@
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
* <element name="identity-mapping" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="group-type-mapping" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}group-type-mappingType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="group-type-mapping" type="{urn:picketlink:idm:config:v1_0_0_cr1}group-type-mappingType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/JbossIdentityType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/JbossIdentityType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/JbossIdentityType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -24,9 +24,9 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="realms" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}realmsType"/>
- * <element name="repositories" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}repositoriesType"/>
- * <element name="stores" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}storesType"/>
+ * <element name="realms" type="{urn:picketlink:idm:config:v1_0_0_cr1}realmsType"/>
+ * <element name="repositories" type="{urn:picketlink:idm:config:v1_0_0_cr1}repositoriesType"/>
+ * <element name="stores" type="{urn:picketlink:idm:config:v1_0_0_cr1}storesType"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/ObjectFactory.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/ObjectFactory.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/ObjectFactory.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -31,7 +31,7 @@
@XmlRegistry
public class ObjectFactory {
- private final static QName _JbossIdentity_QNAME = new QName("urn:jboss:identity:idm:config:v1_0_0_cr1", "jboss-identity");
+ private final static QName _JbossIdentity_QNAME = new QName("urn:picketlink:idm:config:v1_0_0_cr1", "jboss-identity");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.picketlink.impl.configuration.jaxb2.generated
@@ -276,7 +276,7 @@
* Create an instance of {@link JAXBElement }{@code <}{@link JbossIdentityType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "urn:jboss:identity:idm:config:v1_0_0_cr1", name = "jboss-identity")
+ @XmlElementDecl(namespace = "urn:picketlink:idm:config:v1_0_0_cr1", name = "jboss-identity")
public JAXBElement<JbossIdentityType> createJbossIdentity(JbossIdentityType value) {
return new JAXBElement<JbossIdentityType>(_JbossIdentity_QNAME, JbossIdentityType.class, null, value);
}
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/OptionsType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/OptionsType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/OptionsType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -25,7 +25,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="option" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="option" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -26,8 +26,8 @@
* <sequence>
* <element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/>
* <element name="repository-id-ref" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="identity-type-mappings" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-type-mappingsType" minOccurs="0"/>
- * <element name="options" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionsType" minOccurs="0"/>
+ * <element name="identity-type-mappings" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-type-mappingsType" minOccurs="0"/>
+ * <element name="options" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionsType" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmsType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmsType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmsType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -25,7 +25,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="realm" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}realmType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="realm" type="{urn:picketlink:idm:config:v1_0_0_cr1}realmType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RelationshipsType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RelationshipsType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RelationshipsType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -25,7 +25,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="relationship" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}relationshipType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="relationship" type="{urn:picketlink:idm:config:v1_0_0_cr1}relationshipType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoriesType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoriesType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoriesType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -25,7 +25,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="repository" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}repositoryType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="repository" type="{urn:picketlink:idm:config:v1_0_0_cr1}repositoryType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoryType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoryType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoryType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -26,11 +26,11 @@
* <sequence>
* <element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/>
* <element name="class" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="external-config" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}external-configType" minOccurs="0"/>
+ * <element name="external-config" type="{urn:picketlink:idm:config:v1_0_0_cr1}external-configType" minOccurs="0"/>
* <element name="default-identity-store-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
* <element name="default-attribute-store-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="identity-store-mappings" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-store-mappingsType" minOccurs="0"/>
- * <element name="options" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionsType" minOccurs="0"/>
+ * <element name="identity-store-mappings" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-store-mappingsType" minOccurs="0"/>
+ * <element name="options" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionsType" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/StoresType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/StoresType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/StoresType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -25,7 +25,7 @@
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
* <element name="attribute-stores" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="identity-stores" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-storesType"/>
+ * <element name="identity-stores" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-storesType"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/SupportedIdentityObjectTypesType.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/SupportedIdentityObjectTypesType.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/SupportedIdentityObjectTypesType.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -26,7 +26,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="identity-object-type" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-object-typeType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="identity-object-type" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-object-typeType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/package-info.java
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/package-info.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/package-info.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -5,5 +5,5 @@
// Generated on: 2008.12.18 at 03:00:04 PM CET
//
-(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:identity:idm:config:v1_0_0_cr1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:picketlink:idm:config:v1_0_0_cr1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.picketlink.idm.impl.configuration.jaxb2.generated;
Modified: migration/idm/trunk/picketlink-idm-core/src/test/resources/example-db-config.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/test/resources/example-db-config.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/test/resources/example-db-config.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://Example/DB</id>
Modified: migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id></id>
Modified: migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xsd
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xsd 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xsd 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
- targetNamespace="urn:jboss:identity:idm:config:v1_0_0_cr1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="jboss-identity" type="urn:jboss-identityType" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1">
+ targetNamespace="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="jboss-identity" type="urn:jboss-identityType" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1">
<xs:annotation>
- <xs:documentation><xs:schemaattributeFormDefault="unqualified"elementFormDefault="qualified"xmlns:xs="http://www.w3.org/2001/XMLSchema"targetNamespace="urn:jboss:identity:idm:config:v1_0_0_cr1"xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"xmlns:xml="http://www.w3.org/XML/1998/namespace"xmlns:wcc="urn:jboss:identity:idm:config:v1_0_0_cr1"></xs:documentation>
+ <xs:documentation><xs:schemaattributeFormDefault="unqualified"elementFormDefault="qualified"xmlns:xs="http://www.w3.org/2001/XMLSchema"targetNamespace="urn:picketlink:idm:config:v1_0_0_cr1"xmlns="urn:picketlink:idm:config:v1_0_0_cr1"xmlns:xml="http://www.w3.org/XML/1998/namespace"xmlns:wcc="urn:picketlink:idm:config:v1_0_0_cr1"></xs:documentation>
</xs:annotation>
</xs:element>
<xs:complexType name="identity-object-typesType">
@@ -16,13 +16,13 @@
<xs:element type="xs:string" name="id"/>
<xs:element type="xs:string" name="class"/>
<xs:element type="urn:external-configType" name="external-config" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
<xs:element type="xs:string" name="default-identity-store-id" minOccurs="0"/>
<xs:element type="xs:string" name="default-attribute-store-id" minOccurs="0"/>
<xs:element type="urn:identity-store-mappingsType" name="identity-store-mappings" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
<xs:element type="urn:optionsType" name="options" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="identity-storeType">
@@ -30,16 +30,16 @@
<xs:element type="xs:string" name="id"/>
<xs:element type="xs:string" name="class"/>
<xs:element type="urn:external-configType" name="external-config"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
<xs:element type="urn:supported-relationship-typesType" name="supported-relationship-types"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
<xs:element type="urn:supported-identity-object-typesType" name="supported-identity-object-types"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
<xs:element name="options">
<xs:complexType>
<xs:sequence>
<xs:element type="urn:optionType" name="option" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -55,27 +55,27 @@
<xs:complexType name="identity-store-mappingsType">
<xs:sequence>
<xs:element type="urn:identity-store-mappingType" name="identity-store-mapping" maxOccurs="unbounded"
- minOccurs="0" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ minOccurs="0" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="storesType">
<xs:sequence>
<xs:element type="xs:string" name="attribute-stores"/>
<xs:element type="urn:identity-storesType" name="identity-stores"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="jboss-identityType">
<xs:sequence>
- <xs:element type="urn:realmsType" name="realms" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
- <xs:element type="urn:repositoriesType" name="repositories" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
- <xs:element type="urn:storesType" name="stores" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ <xs:element type="urn:realmsType" name="realms" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
+ <xs:element type="urn:repositoriesType" name="repositories" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
+ <xs:element type="urn:storesType" name="stores" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="supported-identity-object-typesType">
<xs:sequence>
<xs:element type="urn:identity-object-typeType" name="identity-object-type" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="optionType">
@@ -98,7 +98,7 @@
<xs:complexType name="repositoriesType">
<xs:sequence>
<xs:element type="urn:repositoryType" name="repository" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="realmType">
@@ -106,28 +106,28 @@
<xs:element type="xs:string" name="id"/>
<xs:element type="xs:string" name="repository-id-ref"/>
<xs:element type="urn:identity-type-mappingsType" name="identity-type-mappings" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
<xs:element type="urn:optionsType" name="options" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="relationshipsType">
<xs:sequence>
<xs:element type="urn:relationshipType" name="relationship" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="realmsType">
<xs:sequence>
<xs:element type="urn:realmType" name="realm" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="identity-type-mappingsType">
<xs:sequence>
<xs:element type="xs:string" name="user-mapping"/>
<xs:element type="urn:group-type-mappingType" name="group-type-mapping" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="supported-relationship-typesType">
@@ -138,21 +138,21 @@
<xs:complexType name="identity-storesType">
<xs:sequence>
<xs:element type="urn:identity-storeType" name="identity-store" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="attributesType">
<xs:sequence>
<xs:element type="urn:attributeType" name="attribute" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="identity-store-mappingType">
<xs:sequence>
<xs:element type="xs:string" name="identity-store-id"/>
<xs:element type="urn:identity-object-typesType" name="identity-object-types"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
- <xs:element type="urn:optionsType" name="options" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
+ <xs:element type="urn:optionsType" name="options" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="relationshipType">
@@ -164,7 +164,7 @@
<xs:complexType name="optionsType">
<xs:sequence>
<xs:element type="urn:optionType" name="option" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="identity-object-typeType">
@@ -174,7 +174,7 @@
<xs:complexType>
<xs:sequence>
<xs:element type="urn:relationshipType" name="relationship" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -189,7 +189,7 @@
<xs:complexType>
<xs:sequence>
<xs:element type="urn:attributeType" name="attribute" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -197,7 +197,7 @@
<xs:complexType>
<xs:sequence>
<xs:element type="urn:optionType" name="option" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
Modified: migration/idm/trunk/picketlink-idm-core/src/test/resources/store-test-config.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/test/resources/store-test-config.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/test/resources/store-test-config.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://Dymmy</id>
Modified: migration/idm/trunk/picketlink-idm-core/src/test/resources/test-config.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-core/src/test/resources/test-config.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-core/src/test/resources/test-config.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>Sample Ralm</id>
Modified: migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -603,9 +603,9 @@
<programlisting>
<![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://JBossIdentityExample/SampleRealm</id>
@@ -1686,9 +1686,9 @@
<programlisting>
<![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://FlexibleRealm</id>
Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java
===================================================================
--- migration/idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1226,9 +1226,11 @@
}
else
{
- q = hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNames).setCacheable(true);;
+ q = hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNames);
}
+ q.setCacheable(true);
+
q.setParameter("realmName", getRealmName(ctx));
if (criteria != null && criteria.getFilter() != null)
@@ -1296,9 +1298,10 @@
}
else
{
- q = hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNamesForIdentityObject).setCacheable(true);
+ q = hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNamesForIdentityObject);
}
+ q.setCacheable(true);
q.setParameter("identityObject", hibernateObject);
if (criteria != null && criteria.isPaged())
@@ -1343,7 +1346,7 @@
try
{
HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNameByName)
- .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).uniqueResult();
+ .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).setCacheable(true).uniqueResult();
if (hiorn == null)
{
@@ -1374,7 +1377,7 @@
try
{
HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNameByName)
- .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).uniqueResult();
+ .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).setCacheable(true).uniqueResult();
if (hiorn == null)
{
@@ -1403,7 +1406,7 @@
try
{
HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNameByName)
- .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).uniqueResult();
+ .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).setCacheable(true).uniqueResult();
if (hiorn == null)
{
@@ -1438,7 +1441,7 @@
query = getHibernateSession(ctx).createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE)
.setParameter("fromIO", fromIO)
.setParameter("toIO", toIO)
- .setParameter("typeName", type.getName());
+ .setParameter("typeName", type.getName()).setCacheable(true);
}
else
{
Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/datasources/directories.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/datasources/directories.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/datasources/directories.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -113,10 +113,10 @@
<cleanup-dn>o=jbid,dc=my-domain,dc=com</cleanup-dn>
</directory>
<directory>
- <directory-name>MSAD</directory-name>
+ <directory-name>MSAD-2k3</directory-name>
<description>ldap://dev44.qa.atl.jboss.com:389</description>
- <config-file>test-identity-config-msad.xml</config-file>
+ <config-file>test-identity-config-msad-2k3.xml</config-file>
<host>dev44.qa.atl.jboss.com</host>
<port>389</port>
<context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory>
@@ -128,6 +128,21 @@
<cleanup-dn>o=jbid,dc=jboss,dc=test</cleanup-dn>
</directory>
<directory>
+ <directory-name>MSAD-2k8</directory-name>
+ <description>ldap://vmg13.mw.lab.eng.bos.redhat.com:389</description>
+
+ <config-file>test-identity-config-msad-2k8.xml</config-file>
+ <host>dev44.qa.atl.jboss.com</host>
+ <port>389</port>
+ <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory>
+ <admin-dn>JBOSS0\jbossqa</admin-dn>
+ <admin-password>jboss42</admin-password>
+
+ <populate-ldif>ldap/initial-empty-msad.ldif</populate-ldif>
+
+ <cleanup-dn>o=jbid,dc=jboss,dc=test</cleanup-dn>
+ </directory>
+ <directory>
<directory-name>MSAD-local</directory-name>
<description>ldap://192.168.56.101:389</description>
Deleted: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/dev44-msad.truststore
===================================================================
(Binary files differ)
Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/identity-config.xsd
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/identity-config.xsd 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/identity-config.xsd 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
- targetNamespace="urn:jboss:identity:idm:config:v1_0_0_cr1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="jboss-identity" type="urn:jboss-identityType" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1">
+ targetNamespace="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="jboss-identity" type="urn:jboss-identityType" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1">
<xs:annotation>
- <xs:documentation><xs:schemaattributeFormDefault="unqualified"elementFormDefault="qualified"xmlns:xs="http://www.w3.org/2001/XMLSchema"targetNamespace="urn:jboss:identity:idm:config:v1_0_0_cr1"xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"xmlns:xml="http://www.w3.org/XML/1998/namespace"xmlns:wcc="urn:jboss:identity:idm:config:v1_0_0_cr1"></xs:documentation>
+ <xs:documentation><xs:schemaattributeFormDefault="unqualified"elementFormDefault="qualified"xmlns:xs="http://www.w3.org/2001/XMLSchema"targetNamespace="urn:picketlink:idm:config:v1_0_0_cr1"xmlns="urn:picketlink:idm:config:v1_0_0_cr1"xmlns:xml="http://www.w3.org/XML/1998/namespace"xmlns:wcc="urn:picketlink:idm:config:v1_0_0_cr1"></xs:documentation>
</xs:annotation>
</xs:element>
<xs:complexType name="identity-object-typesType">
@@ -16,13 +16,13 @@
<xs:element type="xs:string" name="id"/>
<xs:element type="xs:string" name="class"/>
<xs:element type="urn:external-configType" name="external-config" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
<xs:element type="xs:string" name="default-identity-store-id" minOccurs="0"/>
<xs:element type="xs:string" name="default-attribute-store-id" minOccurs="0"/>
<xs:element type="urn:identity-store-mappingsType" name="identity-store-mappings" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
<xs:element type="urn:optionsType" name="options" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="identity-storeType">
@@ -30,16 +30,16 @@
<xs:element type="xs:string" name="id"/>
<xs:element type="xs:string" name="class"/>
<xs:element type="urn:external-configType" name="external-config"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
<xs:element type="urn:supported-relationship-typesType" name="supported-relationship-types"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
<xs:element type="urn:supported-identity-object-typesType" name="supported-identity-object-types"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
<xs:element name="options">
<xs:complexType>
<xs:sequence>
<xs:element type="urn:optionType" name="option" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -55,27 +55,27 @@
<xs:complexType name="identity-store-mappingsType">
<xs:sequence>
<xs:element type="urn:identity-store-mappingType" name="identity-store-mapping" maxOccurs="unbounded"
- minOccurs="0" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ minOccurs="0" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="storesType">
<xs:sequence>
<xs:element type="xs:string" name="attribute-stores"/>
<xs:element type="urn:identity-storesType" name="identity-stores"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="jboss-identityType">
<xs:sequence>
- <xs:element type="urn:realmsType" name="realms" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
- <xs:element type="urn:repositoriesType" name="repositories" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
- <xs:element type="urn:storesType" name="stores" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ <xs:element type="urn:realmsType" name="realms" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
+ <xs:element type="urn:repositoriesType" name="repositories" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
+ <xs:element type="urn:storesType" name="stores" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="supported-identity-object-typesType">
<xs:sequence>
<xs:element type="urn:identity-object-typeType" name="identity-object-type" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="optionType">
@@ -98,7 +98,7 @@
<xs:complexType name="repositoriesType">
<xs:sequence>
<xs:element type="urn:repositoryType" name="repository" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="realmType">
@@ -106,28 +106,28 @@
<xs:element type="xs:string" name="id"/>
<xs:element type="xs:string" name="repository-id-ref"/>
<xs:element type="urn:identity-type-mappingsType" name="identity-type-mappings" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
<xs:element type="urn:optionsType" name="options" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="relationshipsType">
<xs:sequence>
<xs:element type="urn:relationshipType" name="relationship" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="realmsType">
<xs:sequence>
<xs:element type="urn:realmType" name="realm" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="identity-type-mappingsType">
<xs:sequence>
<xs:element type="xs:string" name="user-mapping"/>
<xs:element type="urn:group-type-mappingType" name="group-type-mapping" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="supported-relationship-typesType">
@@ -138,21 +138,21 @@
<xs:complexType name="identity-storesType">
<xs:sequence>
<xs:element type="urn:identity-storeType" name="identity-store" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="attributesType">
<xs:sequence>
<xs:element type="urn:attributeType" name="attribute" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="identity-store-mappingType">
<xs:sequence>
<xs:element type="xs:string" name="identity-store-id"/>
<xs:element type="urn:identity-object-typesType" name="identity-object-types"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
- <xs:element type="urn:optionsType" name="options" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
+ <xs:element type="urn:optionsType" name="options" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="relationshipType">
@@ -164,7 +164,7 @@
<xs:complexType name="optionsType">
<xs:sequence>
<xs:element type="urn:optionType" name="option" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="identity-object-typeType">
@@ -174,7 +174,7 @@
<xs:complexType>
<xs:sequence>
<xs:element type="urn:relationshipType" name="relationship" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -189,7 +189,7 @@
<xs:complexType>
<xs:sequence>
<xs:element type="urn:attributeType" name="attribute" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -197,7 +197,7 @@
<xs:complexType>
<xs:sequence>
<xs:element type="urn:optionType" name="option" maxOccurs="unbounded" minOccurs="0"
- xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/>
+ xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/minimal-flexible-identity-config.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/minimal-flexible-identity-config.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/minimal-flexible-identity-config.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://FlexibleRealm</id>
Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/store-test-config.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/store-test-config.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/store-test-config.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://Dymmy</id>
Copied: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k3.xml (from rev 1015, migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad.xml)
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k3.xml (rev 0)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k3.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -0,0 +1,912 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
+ <realms>
+ <realm>
+ <id>realm://RedHat/DB</id>
+ <repository-id-ref>RedHat Repository DB</repository-id-ref>
+ <identity-type-mappings>
+ <user-mapping>USER</user-mapping>
+ </identity-type-mappings>
+ </realm>
+ <realm>
+ <id>realm://portal/SamplePortal/DB</id>
+ <repository-id-ref>Sample Portal Repository DB</repository-id-ref>
+ <identity-type-mappings>
+ <user-mapping>USER</user-mapping>
+ </identity-type-mappings>
+ </realm>
+ <realm>
+ <id>realm://RedHat/DB_LDAP</id>
+ <repository-id-ref>RedHat Repository DB+LDAP</repository-id-ref>
+ <identity-type-mappings>
+ <user-mapping>USER</user-mapping>
+ </identity-type-mappings>
+ </realm>
+ <realm>
+ <id>realm://portal/SamplePortal/DB_LDAP</id>
+ <repository-id-ref>Sample Portal Repository DB+LDAP</repository-id-ref>
+ <identity-type-mappings>
+ <user-mapping>USER</user-mapping>
+ </identity-type-mappings>
+ </realm>
+ </realms>
+ <repositories>
+ <repository>
+ <id>RedHat Repository DB</id>
+ <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
+ <external-config/>
+ <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
+ <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
+ <options>
+ <option>
+ <name>allowNotDefinedAttributes</name>
+ <value>true</value>
+ </option>
+ </options>
+ </repository>
+ <repository>
+ <id>Sample Portal Repository DB</id>
+ <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
+ <external-config/>
+ <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
+ <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
+ <options>
+ <option>
+ <name>allowNotDefinedAttributes</name>
+ <value>true</value>
+ </option>
+ </options>
+ </repository>
+ <repository>
+ <id>RedHat Repository DB+LDAP</id>
+ <class>org.picketlink.idm.impl.repository.FallbackIdentityStoreRepository</class>
+ <external-config/>
+ <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
+ <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
+ <identity-store-mappings>
+ <identity-store-mapping>
+ <identity-store-id>Hibernate Identity Store</identity-store-id>
+ <identity-object-types>
+ <identity-object-type>DIVISION</identity-object-type>
+ <identity-object-type>PROJECT</identity-object-type>
+ <identity-object-type>PEOPLE</identity-object-type>
+ </identity-object-types>
+ <options/>
+ </identity-store-mapping>
+ <identity-store-mapping>
+ <identity-store-id>LDAP Identity Store</identity-store-id>
+ <identity-object-types>
+ <identity-object-type>USER</identity-object-type>
+ <identity-object-type>ORGANIZATION</identity-object-type>
+ <identity-object-type>ORGANIZATION_UNIT</identity-object-type>
+ <identity-object-type>DEPARTMENT</identity-object-type>
+ </identity-object-types>
+ <options>
+ <option>
+ <name>cache</name>
+ <value>false</value>
+ </option>
+ <option>
+ <name>cache.providerClass</name>
+ <value>org.picketlink.idm.impl.cache.JBossCacheIdentityStoreCacheProviderImpl</value>
+ </option>
+ <option>
+ <name>cache.configFile</name>
+ <value>jboss-cache-config.xml</value>
+ </option>
+ </options>
+ </identity-store-mapping>
+ </identity-store-mappings>
+ <options>
+ <option>
+ <name>allowNotDefinedAttributes</name>
+ <value>true</value>
+ </option>
+ </options>
+ </repository>
+ <repository>
+ <id>Sample Portal Repository DB+LDAP</id>
+ <class>org.picketlink.idm.impl.repository.FallbackIdentityStoreRepository</class>
+ <external-config/>
+ <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
+ <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
+ <identity-store-mappings>
+ <identity-store-mapping>
+ <identity-store-id>Hibernate Identity Store</identity-store-id>
+ <identity-object-types>
+ <identity-object-type>SYSTEM</identity-object-type>
+ <identity-object-type>ADMINISTRATION</identity-object-type>
+ <identity-object-type>COMMUNITY</identity-object-type>
+ <identity-object-type>DIVISION</identity-object-type>
+ <identity-object-type>SECURITY</identity-object-type>
+ <identity-object-type>PEOPLE</identity-object-type>
+ </identity-object-types>
+ <options/>
+ </identity-store-mapping>
+ <identity-store-mapping>
+ <identity-store-id>LDAP Identity Store</identity-store-id>
+ <identity-object-types>
+ <identity-object-type>USER</identity-object-type>
+ <identity-object-type>DEPARTMENT</identity-object-type>
+ <identity-object-type>ORGANIZATION</identity-object-type>
+ <identity-object-type>ORGANIZATION_UNIT</identity-object-type>
+ <identity-object-type>OFFICE</identity-object-type>
+ </identity-object-types>
+ <options>
+ <option>
+ <name>cache</name>
+ <value>false</value>
+ </option>
+ <option>
+ <name>cache.providerClass</name>
+ <value>org.picketlink.idm.impl.cache.JBossCacheIdentityStoreCacheProviderImpl</value>
+ </option>
+ <option>
+ <name>cache.configFile</name>
+ <value>jboss-cache-config.xml</value>
+ </option>
+ </options>
+ </identity-store-mapping>
+ </identity-store-mappings>
+ <options>
+ <option>
+ <name>allowNotDefinedAttributes</name>
+ <value>true</value>
+ </option>
+ </options>
+ </repository>
+ </repositories>
+ <stores>
+ <attribute-stores/>
+ <identity-stores>
+ <identity-store>
+ <id>Hibernate Identity 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>
+ </relationships>
+ <credentials>
+ <credential-type>PASSWORD</credential-type>
+ <credential-type>BINARY</credential-type>
+ </credentials>
+ <attributes>
+ <attribute>
+ <name>picture</name>
+ <mapping>user.picture</mapping>
+ <type>binary</type>
+ <isRequired>false</isRequired>
+ <isMultivalued>false</isMultivalued>
+ <isReadOnly>false</isReadOnly>
+ </attribute>
+ <attribute>
+ <name>email</name>
+ <mapping>mail</mapping>
+ <type>text</type>
+ <isRequired>false</isRequired>
+ <isMultivalued>false</isMultivalued>
+ <isReadOnly>false</isReadOnly>
+ <isUnique>true</isUnique>
+ </attribute>
+ </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>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>ORGANIZATION</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>DIVISION</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>ORGANIZATION_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>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>DIVISION</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>OFFICE</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>PEOPLE</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>PROJECT</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>DIVISION</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>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>DEPARTMENT</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>DEPARTMENT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>PROJECT</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>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>PEOPLE</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>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>ADMINISTRATION</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>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>COMMUNITY</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>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>OFFICE</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>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>SECURITY</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>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>SYSTEM</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>SECURITY</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>COMMUNITY</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>ORGANIZATION</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ </supported-identity-object-types>
+ <options>
+ <!--<option>-->
+ <!--<name>hibernateConfiguration</name>-->
+ <!--<value>hibernate-jboss-identity.cfg.xml</value>-->
+ <!--</option>-->
+ <option>
+ <name>hibernateSessionFactoryJNDIName</name>
+ <value>java:/jbossidentity/HibernateStoreSessionFactory</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>
+ <option>
+ <name>allowNotDefinedAttributes</name>
+ <value>true</value>
+ </option>
+ </options>
+ </identity-store>
+ <identity-store>
+ <id>LDAP Identity Store</id>
+ <class>org.picketlink.idm.impl.store.ldap.LDAPIdentityStoreImpl</class>
+ <external-config/>
+ <supported-relationship-types>
+ <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type>
+ </supported-relationship-types>
+ <supported-identity-object-types>
+ <identity-object-type>
+ <name>USER</name>
+ <relationships/>
+ <credentials>
+ <credential-type>PASSWORD</credential-type>
+ </credentials>
+ <attributes>
+ <attribute>
+ <name>phone</name>
+ <mapping>telephoneNumber</mapping>
+ <type>text</type>
+ <isRequired>false</isRequired>
+ <isMultivalued>false</isMultivalued>
+ <isReadOnly>false</isReadOnly>
+ </attribute>
+ <attribute>
+ <name>description</name>
+ <mapping>description</mapping>
+ <type>text</type>
+ <isRequired>false</isRequired>
+ <isMultivalued>false</isMultivalued>
+ <isReadOnly>false</isReadOnly>
+ </attribute>
+ <attribute>
+ <name>carLicense</name>
+ <mapping>carLicense</mapping>
+ <type>text</type>
+ <isRequired>false</isRequired>
+ <isMultivalued>false</isMultivalued>
+ <isReadOnly>false</isReadOnly>
+ </attribute>
+ <attribute>
+ <name>email</name>
+ <mapping>mail</mapping>
+ <type>text</type>
+ <isRequired>false</isRequired>
+ <isMultivalued>false</isMultivalued>
+ <isReadOnly>false</isReadOnly>
+ <isUnique>true</isUnique>
+ </attribute>
+ </attributes>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>passwordAttributeName</name>
+ <value>unicodePwd</value>
+ </option>
+ <option>
+ <name>enclosePasswordWith</name>
+ <value>"</value>
+ </option>
+ <option>
+ <name>passwordEncoding</name>
+ <value>UTF-16LE</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=People,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=inetOrgPerson</value>
+ <value>sn= </value>
+ <value>userAccountControl=514</value>
+ <!--<value>cn= </value>-->
+ </option>
+ <option>
+ <name>passwordUpdateAttributeValues</name>
+ <value>userAccountControl=512</value>
+ </option>
+ </options>
+ </identity-object-type>
+ <identity-object-type>
+ <name>ORGANIZATION</name>
+ <relationships>
+ <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>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>ORGANIZATION</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>OFFICE</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=Organizations,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <!--<option>-->
+ <!--<name>entrySearchFilter</name>-->
+ <!--<value></value>-->
+ <!--</option>-->
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>parentMembershipAttributeName</name>
+ <value>member</value>
+ </option>
+ <option>
+ <name>isParentMembershipAttributeDN</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowEmptyMemberships</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=group</value>
+ <value>groupType=8</value>
+ </option>
+ </options>
+ </identity-object-type>
+ <identity-object-type>
+ <name>ORGANIZATION_UNIT</name>
+ <relationships>
+ <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>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>OFFICE</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=OrganizationUnits,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <!--<option>-->
+ <!--<name>entrySearchFilter</name>-->
+ <!--<value></value>-->
+ <!--</option>-->
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>parentMembershipAttributeName</name>
+ <value>member</value>
+ </option>
+ <option>
+ <name>isParentMembershipAttributeDN</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowEmptyMemberships</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=group</value>
+ <value>groupType=8</value>
+
+ </option>
+ </options>
+ </identity-object-type>
+ <identity-object-type>
+ <name>DEPARTMENT</name>
+ <relationships>
+ <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>DEPARTMENT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=Departments,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <!--<option>-->
+ <!--<name>entrySearchFilter</name>-->
+ <!--<value></value>-->
+ <!--</option>-->
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>parentMembershipAttributeName</name>
+ <value>member</value>
+ </option>
+ <option>
+ <name>isParentMembershipAttributeDN</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowEmptyMemberships</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=group</value>
+ <value>groupType=8</value>
+ </option>
+ </options>
+ </identity-object-type>
+ <identity-object-type>
+ <name>OFFICE</name>
+ <relationships>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=Offices,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <!--<option>-->
+ <!--<name>entrySearchFilter</name>-->
+ <!--<value></value>-->
+ <!--</option>-->
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>parentMembershipAttributeName</name>
+ <value>member</value>
+ </option>
+ <option>
+ <name>isParentMembershipAttributeDN</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowEmptyMemberships</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=group</value>
+ <value>groupType=8</value>
+ </option>
+ </options>
+ </identity-object-type>
+ <identity-object-type>
+ <name>GROUP</name>
+ <relationships>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=Groups,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <!--<option>-->
+ <!--<name>entrySearchFilter</name>-->
+ <!--<value></value>-->
+ <!--</option>-->
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>parentMembershipAttributeName</name>
+ <value>member</value>
+ </option>
+ <option>
+ <name>isParentMembershipAttributeDN</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowEmptyMemberships</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=group</value>
+ <value>groupType=8</value>
+ </option>
+ </options>
+ </identity-object-type>
+ <identity-object-type>
+ <name>ROLE</name>
+ <relationships>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=Roles,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <!--<option>-->
+ <!--<name>entrySearchFilter</name>-->
+ <!--<value></value>-->
+ <!--</option>-->
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>parentMembershipAttributeName</name>
+ <value>member</value>
+ </option>
+ <option>
+ <name>isParentMembershipAttributeDN</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowEmptyMemberships</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=group</value>
+ <value>groupType=8</value>
+ </option>
+ </options>
+ </identity-object-type>
+ </supported-identity-object-types>
+ <options>
+ <option>
+ <name>providerURL</name>
+ <value>ldaps://dev44.qa.atl.jboss.com:636</value>
+ </option>
+ <option>
+ <name>adminDN</name>
+ <value>JBOSS\jbossqa</value>
+ </option>
+ <option>
+ <name>adminPassword</name>
+ <value>jboss42</value>
+ </option>
+ <option>
+ <name>authenticationMethod</name>
+ <value>simple</value>
+ </option>
+ <!--<option>-->
+ <!--<name>customSystemProperties</name>-->
+ <!--<value>javax.net.ssl.trustStore=d:\Workshop\dev44-msad.truststore</value>-->
+ <!--<value>javax.net.ssl.trustStorePassword=password</value>-->
+ <!--</option>-->
+ <option>
+ <name>searchTimeLimit</name>
+ <value>10000</value>
+ </option>
+ </options>
+ </identity-store>
+ </identity-stores>
+ </stores>
+</jboss-identity>
\ No newline at end of file
Added: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k8.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k8.xml (rev 0)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k8.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -0,0 +1,912 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
+ <realms>
+ <realm>
+ <id>realm://RedHat/DB</id>
+ <repository-id-ref>RedHat Repository DB</repository-id-ref>
+ <identity-type-mappings>
+ <user-mapping>USER</user-mapping>
+ </identity-type-mappings>
+ </realm>
+ <realm>
+ <id>realm://portal/SamplePortal/DB</id>
+ <repository-id-ref>Sample Portal Repository DB</repository-id-ref>
+ <identity-type-mappings>
+ <user-mapping>USER</user-mapping>
+ </identity-type-mappings>
+ </realm>
+ <realm>
+ <id>realm://RedHat/DB_LDAP</id>
+ <repository-id-ref>RedHat Repository DB+LDAP</repository-id-ref>
+ <identity-type-mappings>
+ <user-mapping>USER</user-mapping>
+ </identity-type-mappings>
+ </realm>
+ <realm>
+ <id>realm://portal/SamplePortal/DB_LDAP</id>
+ <repository-id-ref>Sample Portal Repository DB+LDAP</repository-id-ref>
+ <identity-type-mappings>
+ <user-mapping>USER</user-mapping>
+ </identity-type-mappings>
+ </realm>
+ </realms>
+ <repositories>
+ <repository>
+ <id>RedHat Repository DB</id>
+ <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
+ <external-config/>
+ <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
+ <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
+ <options>
+ <option>
+ <name>allowNotDefinedAttributes</name>
+ <value>true</value>
+ </option>
+ </options>
+ </repository>
+ <repository>
+ <id>Sample Portal Repository DB</id>
+ <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
+ <external-config/>
+ <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
+ <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
+ <options>
+ <option>
+ <name>allowNotDefinedAttributes</name>
+ <value>true</value>
+ </option>
+ </options>
+ </repository>
+ <repository>
+ <id>RedHat Repository DB+LDAP</id>
+ <class>org.picketlink.idm.impl.repository.FallbackIdentityStoreRepository</class>
+ <external-config/>
+ <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
+ <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
+ <identity-store-mappings>
+ <identity-store-mapping>
+ <identity-store-id>Hibernate Identity Store</identity-store-id>
+ <identity-object-types>
+ <identity-object-type>DIVISION</identity-object-type>
+ <identity-object-type>PROJECT</identity-object-type>
+ <identity-object-type>PEOPLE</identity-object-type>
+ </identity-object-types>
+ <options/>
+ </identity-store-mapping>
+ <identity-store-mapping>
+ <identity-store-id>LDAP Identity Store</identity-store-id>
+ <identity-object-types>
+ <identity-object-type>USER</identity-object-type>
+ <identity-object-type>ORGANIZATION</identity-object-type>
+ <identity-object-type>ORGANIZATION_UNIT</identity-object-type>
+ <identity-object-type>DEPARTMENT</identity-object-type>
+ </identity-object-types>
+ <options>
+ <option>
+ <name>cache</name>
+ <value>false</value>
+ </option>
+ <option>
+ <name>cache.providerClass</name>
+ <value>org.picketlink.idm.impl.cache.JBossCacheIdentityStoreCacheProviderImpl</value>
+ </option>
+ <option>
+ <name>cache.configFile</name>
+ <value>jboss-cache-config.xml</value>
+ </option>
+ </options>
+ </identity-store-mapping>
+ </identity-store-mappings>
+ <options>
+ <option>
+ <name>allowNotDefinedAttributes</name>
+ <value>true</value>
+ </option>
+ </options>
+ </repository>
+ <repository>
+ <id>Sample Portal Repository DB+LDAP</id>
+ <class>org.picketlink.idm.impl.repository.FallbackIdentityStoreRepository</class>
+ <external-config/>
+ <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
+ <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
+ <identity-store-mappings>
+ <identity-store-mapping>
+ <identity-store-id>Hibernate Identity Store</identity-store-id>
+ <identity-object-types>
+ <identity-object-type>SYSTEM</identity-object-type>
+ <identity-object-type>ADMINISTRATION</identity-object-type>
+ <identity-object-type>COMMUNITY</identity-object-type>
+ <identity-object-type>DIVISION</identity-object-type>
+ <identity-object-type>SECURITY</identity-object-type>
+ <identity-object-type>PEOPLE</identity-object-type>
+ </identity-object-types>
+ <options/>
+ </identity-store-mapping>
+ <identity-store-mapping>
+ <identity-store-id>LDAP Identity Store</identity-store-id>
+ <identity-object-types>
+ <identity-object-type>USER</identity-object-type>
+ <identity-object-type>DEPARTMENT</identity-object-type>
+ <identity-object-type>ORGANIZATION</identity-object-type>
+ <identity-object-type>ORGANIZATION_UNIT</identity-object-type>
+ <identity-object-type>OFFICE</identity-object-type>
+ </identity-object-types>
+ <options>
+ <option>
+ <name>cache</name>
+ <value>false</value>
+ </option>
+ <option>
+ <name>cache.providerClass</name>
+ <value>org.picketlink.idm.impl.cache.JBossCacheIdentityStoreCacheProviderImpl</value>
+ </option>
+ <option>
+ <name>cache.configFile</name>
+ <value>jboss-cache-config.xml</value>
+ </option>
+ </options>
+ </identity-store-mapping>
+ </identity-store-mappings>
+ <options>
+ <option>
+ <name>allowNotDefinedAttributes</name>
+ <value>true</value>
+ </option>
+ </options>
+ </repository>
+ </repositories>
+ <stores>
+ <attribute-stores/>
+ <identity-stores>
+ <identity-store>
+ <id>Hibernate Identity 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>
+ </relationships>
+ <credentials>
+ <credential-type>PASSWORD</credential-type>
+ <credential-type>BINARY</credential-type>
+ </credentials>
+ <attributes>
+ <attribute>
+ <name>picture</name>
+ <mapping>user.picture</mapping>
+ <type>binary</type>
+ <isRequired>false</isRequired>
+ <isMultivalued>false</isMultivalued>
+ <isReadOnly>false</isReadOnly>
+ </attribute>
+ <attribute>
+ <name>email</name>
+ <mapping>mail</mapping>
+ <type>text</type>
+ <isRequired>false</isRequired>
+ <isMultivalued>false</isMultivalued>
+ <isReadOnly>false</isReadOnly>
+ <isUnique>true</isUnique>
+ </attribute>
+ </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>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>ORGANIZATION</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>DIVISION</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>ORGANIZATION_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>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>DIVISION</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>OFFICE</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>PEOPLE</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>PROJECT</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>DIVISION</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>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>DEPARTMENT</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>DEPARTMENT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>PROJECT</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>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>PEOPLE</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>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>ADMINISTRATION</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>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>COMMUNITY</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>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>OFFICE</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>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>SECURITY</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>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ <identity-object-type>
+ <name>SYSTEM</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>SECURITY</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>COMMUNITY</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>ORGANIZATION</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
+ </supported-identity-object-types>
+ <options>
+ <!--<option>-->
+ <!--<name>hibernateConfiguration</name>-->
+ <!--<value>hibernate-jboss-identity.cfg.xml</value>-->
+ <!--</option>-->
+ <option>
+ <name>hibernateSessionFactoryJNDIName</name>
+ <value>java:/jbossidentity/HibernateStoreSessionFactory</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>
+ <option>
+ <name>allowNotDefinedAttributes</name>
+ <value>true</value>
+ </option>
+ </options>
+ </identity-store>
+ <identity-store>
+ <id>LDAP Identity Store</id>
+ <class>org.picketlink.idm.impl.store.ldap.LDAPIdentityStoreImpl</class>
+ <external-config/>
+ <supported-relationship-types>
+ <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type>
+ </supported-relationship-types>
+ <supported-identity-object-types>
+ <identity-object-type>
+ <name>USER</name>
+ <relationships/>
+ <credentials>
+ <credential-type>PASSWORD</credential-type>
+ </credentials>
+ <attributes>
+ <attribute>
+ <name>phone</name>
+ <mapping>telephoneNumber</mapping>
+ <type>text</type>
+ <isRequired>false</isRequired>
+ <isMultivalued>false</isMultivalued>
+ <isReadOnly>false</isReadOnly>
+ </attribute>
+ <attribute>
+ <name>description</name>
+ <mapping>description</mapping>
+ <type>text</type>
+ <isRequired>false</isRequired>
+ <isMultivalued>false</isMultivalued>
+ <isReadOnly>false</isReadOnly>
+ </attribute>
+ <attribute>
+ <name>carLicense</name>
+ <mapping>carLicense</mapping>
+ <type>text</type>
+ <isRequired>false</isRequired>
+ <isMultivalued>false</isMultivalued>
+ <isReadOnly>false</isReadOnly>
+ </attribute>
+ <attribute>
+ <name>email</name>
+ <mapping>mail</mapping>
+ <type>text</type>
+ <isRequired>false</isRequired>
+ <isMultivalued>false</isMultivalued>
+ <isReadOnly>false</isReadOnly>
+ <isUnique>true</isUnique>
+ </attribute>
+ </attributes>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>passwordAttributeName</name>
+ <value>unicodePwd</value>
+ </option>
+ <option>
+ <name>enclosePasswordWith</name>
+ <value>"</value>
+ </option>
+ <option>
+ <name>passwordEncoding</name>
+ <value>UTF-16LE</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=People,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=inetOrgPerson</value>
+ <value>sn= </value>
+ <value>userAccountControl=514</value>
+ <!--<value>cn= </value>-->
+ </option>
+ <option>
+ <name>passwordUpdateAttributeValues</name>
+ <value>userAccountControl=512</value>
+ </option>
+ </options>
+ </identity-object-type>
+ <identity-object-type>
+ <name>ORGANIZATION</name>
+ <relationships>
+ <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>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>ORGANIZATION</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>OFFICE</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=Organizations,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <!--<option>-->
+ <!--<name>entrySearchFilter</name>-->
+ <!--<value></value>-->
+ <!--</option>-->
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>parentMembershipAttributeName</name>
+ <value>member</value>
+ </option>
+ <option>
+ <name>isParentMembershipAttributeDN</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowEmptyMemberships</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=group</value>
+ <value>groupType=8</value>
+ </option>
+ </options>
+ </identity-object-type>
+ <identity-object-type>
+ <name>ORGANIZATION_UNIT</name>
+ <relationships>
+ <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>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>OFFICE</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=OrganizationUnits,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <!--<option>-->
+ <!--<name>entrySearchFilter</name>-->
+ <!--<value></value>-->
+ <!--</option>-->
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>parentMembershipAttributeName</name>
+ <value>member</value>
+ </option>
+ <option>
+ <name>isParentMembershipAttributeDN</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowEmptyMemberships</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=group</value>
+ <value>groupType=8</value>
+
+ </option>
+ </options>
+ </identity-object-type>
+ <identity-object-type>
+ <name>DEPARTMENT</name>
+ <relationships>
+ <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>DEPARTMENT</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=Departments,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <!--<option>-->
+ <!--<name>entrySearchFilter</name>-->
+ <!--<value></value>-->
+ <!--</option>-->
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>parentMembershipAttributeName</name>
+ <value>member</value>
+ </option>
+ <option>
+ <name>isParentMembershipAttributeDN</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowEmptyMemberships</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=group</value>
+ <value>groupType=8</value>
+ </option>
+ </options>
+ </identity-object-type>
+ <identity-object-type>
+ <name>OFFICE</name>
+ <relationships>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=Offices,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <!--<option>-->
+ <!--<name>entrySearchFilter</name>-->
+ <!--<value></value>-->
+ <!--</option>-->
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>parentMembershipAttributeName</name>
+ <value>member</value>
+ </option>
+ <option>
+ <name>isParentMembershipAttributeDN</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowEmptyMemberships</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=group</value>
+ <value>groupType=8</value>
+ </option>
+ </options>
+ </identity-object-type>
+ <identity-object-type>
+ <name>GROUP</name>
+ <relationships>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=Groups,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <!--<option>-->
+ <!--<name>entrySearchFilter</name>-->
+ <!--<value></value>-->
+ <!--</option>-->
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>parentMembershipAttributeName</name>
+ <value>member</value>
+ </option>
+ <option>
+ <name>isParentMembershipAttributeDN</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowEmptyMemberships</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=group</value>
+ <value>groupType=8</value>
+ </option>
+ </options>
+ </identity-object-type>
+ <identity-object-type>
+ <name>ROLE</name>
+ <relationships>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options>
+ <option>
+ <name>idAttributeName</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>ctxDNs</name>
+ <value>ou=Roles,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
+ </option>
+ <!--<option>-->
+ <!--<name>entrySearchFilter</name>-->
+ <!--<value></value>-->
+ <!--</option>-->
+ <option>
+ <name>allowCreateEntry</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>parentMembershipAttributeName</name>
+ <value>member</value>
+ </option>
+ <option>
+ <name>isParentMembershipAttributeDN</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>allowEmptyMemberships</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>createEntryAttributeValues</name>
+ <value>objectClass=top</value>
+ <value>objectClass=group</value>
+ <value>groupType=8</value>
+ </option>
+ </options>
+ </identity-object-type>
+ </supported-identity-object-types>
+ <options>
+ <option>
+ <name>providerURL</name>
+ <value>ldaps://vmg13.mw.lab.eng.bos.redhat.com:636</value>
+ </option>
+ <option>
+ <name>adminDN</name>
+ <value>JBOSS0\jbossqa</value>
+ </option>
+ <option>
+ <name>adminPassword</name>
+ <value>jboss42</value>
+ </option>
+ <option>
+ <name>authenticationMethod</name>
+ <value>simple</value>
+ </option>
+ <!--<option>-->
+ <!--<name>customSystemProperties</name>-->
+ <!--<value>javax.net.ssl.trustStore=d:\Workshop\vmg13-msad.truststore</value>-->
+ <!--<value>javax.net.ssl.trustStorePassword=password</value>-->
+ <!--</option>-->
+ <option>
+ <name>searchTimeLimit</name>
+ <value>10000</value>
+ </option>
+ </options>
+ </identity-store>
+ </identity-stores>
+ </stores>
+</jboss-identity>
\ No newline at end of file
Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-local.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-local.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-local.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://RedHat/DB</id>
@@ -911,7 +911,7 @@
</option>
<option>
<name>adminPassword</name>
- <value>1q@W3e4r</value>
+ <value>1q@W3e4r<4/value>
</option>
<option>
<name>authenticationMethod</name>
Deleted: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,912 +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://RedHat/DB</id>
- <repository-id-ref>RedHat Repository DB</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- </realm>
- <realm>
- <id>realm://portal/SamplePortal/DB</id>
- <repository-id-ref>Sample Portal Repository DB</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- </realm>
- <realm>
- <id>realm://RedHat/DB_LDAP</id>
- <repository-id-ref>RedHat Repository DB+LDAP</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- </realm>
- <realm>
- <id>realm://portal/SamplePortal/DB_LDAP</id>
- <repository-id-ref>Sample Portal Repository DB+LDAP</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- </realm>
- </realms>
- <repositories>
- <repository>
- <id>RedHat Repository DB</id>
- <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
- <external-config/>
- <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
- <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
- <options>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- </options>
- </repository>
- <repository>
- <id>Sample Portal Repository DB</id>
- <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
- <external-config/>
- <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
- <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
- <options>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- </options>
- </repository>
- <repository>
- <id>RedHat Repository DB+LDAP</id>
- <class>org.picketlink.idm.impl.repository.FallbackIdentityStoreRepository</class>
- <external-config/>
- <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
- <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
- <identity-store-mappings>
- <identity-store-mapping>
- <identity-store-id>Hibernate Identity Store</identity-store-id>
- <identity-object-types>
- <identity-object-type>DIVISION</identity-object-type>
- <identity-object-type>PROJECT</identity-object-type>
- <identity-object-type>PEOPLE</identity-object-type>
- </identity-object-types>
- <options/>
- </identity-store-mapping>
- <identity-store-mapping>
- <identity-store-id>LDAP Identity Store</identity-store-id>
- <identity-object-types>
- <identity-object-type>USER</identity-object-type>
- <identity-object-type>ORGANIZATION</identity-object-type>
- <identity-object-type>ORGANIZATION_UNIT</identity-object-type>
- <identity-object-type>DEPARTMENT</identity-object-type>
- </identity-object-types>
- <options>
- <option>
- <name>cache</name>
- <value>false</value>
- </option>
- <option>
- <name>cache.providerClass</name>
- <value>org.picketlink.idm.impl.cache.JBossCacheIdentityStoreCacheProviderImpl</value>
- </option>
- <option>
- <name>cache.configFile</name>
- <value>jboss-cache-config.xml</value>
- </option>
- </options>
- </identity-store-mapping>
- </identity-store-mappings>
- <options>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- </options>
- </repository>
- <repository>
- <id>Sample Portal Repository DB+LDAP</id>
- <class>org.picketlink.idm.impl.repository.FallbackIdentityStoreRepository</class>
- <external-config/>
- <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
- <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
- <identity-store-mappings>
- <identity-store-mapping>
- <identity-store-id>Hibernate Identity Store</identity-store-id>
- <identity-object-types>
- <identity-object-type>SYSTEM</identity-object-type>
- <identity-object-type>ADMINISTRATION</identity-object-type>
- <identity-object-type>COMMUNITY</identity-object-type>
- <identity-object-type>DIVISION</identity-object-type>
- <identity-object-type>SECURITY</identity-object-type>
- <identity-object-type>PEOPLE</identity-object-type>
- </identity-object-types>
- <options/>
- </identity-store-mapping>
- <identity-store-mapping>
- <identity-store-id>LDAP Identity Store</identity-store-id>
- <identity-object-types>
- <identity-object-type>USER</identity-object-type>
- <identity-object-type>DEPARTMENT</identity-object-type>
- <identity-object-type>ORGANIZATION</identity-object-type>
- <identity-object-type>ORGANIZATION_UNIT</identity-object-type>
- <identity-object-type>OFFICE</identity-object-type>
- </identity-object-types>
- <options>
- <option>
- <name>cache</name>
- <value>false</value>
- </option>
- <option>
- <name>cache.providerClass</name>
- <value>org.picketlink.idm.impl.cache.JBossCacheIdentityStoreCacheProviderImpl</value>
- </option>
- <option>
- <name>cache.configFile</name>
- <value>jboss-cache-config.xml</value>
- </option>
- </options>
- </identity-store-mapping>
- </identity-store-mappings>
- <options>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- </options>
- </repository>
- </repositories>
- <stores>
- <attribute-stores/>
- <identity-stores>
- <identity-store>
- <id>Hibernate Identity 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>
- </relationships>
- <credentials>
- <credential-type>PASSWORD</credential-type>
- <credential-type>BINARY</credential-type>
- </credentials>
- <attributes>
- <attribute>
- <name>picture</name>
- <mapping>user.picture</mapping>
- <type>binary</type>
- <isRequired>false</isRequired>
- <isMultivalued>false</isMultivalued>
- <isReadOnly>false</isReadOnly>
- </attribute>
- <attribute>
- <name>email</name>
- <mapping>mail</mapping>
- <type>text</type>
- <isRequired>false</isRequired>
- <isMultivalued>false</isMultivalued>
- <isReadOnly>false</isReadOnly>
- <isUnique>true</isUnique>
- </attribute>
- </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>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DIVISION</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>ORGANIZATION_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>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DIVISION</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>OFFICE</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>PEOPLE</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>PROJECT</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>DIVISION</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>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>DEPARTMENT</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>DEPARTMENT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>PROJECT</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>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>PEOPLE</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>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>ADMINISTRATION</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>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>COMMUNITY</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>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>OFFICE</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>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>SECURITY</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>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>SYSTEM</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>SECURITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>COMMUNITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- </supported-identity-object-types>
- <options>
- <!--<option>-->
- <!--<name>hibernateConfiguration</name>-->
- <!--<value>hibernate-jboss-identity.cfg.xml</value>-->
- <!--</option>-->
- <option>
- <name>hibernateSessionFactoryJNDIName</name>
- <value>java:/jbossidentity/HibernateStoreSessionFactory</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>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- </options>
- </identity-store>
- <identity-store>
- <id>LDAP Identity Store</id>
- <class>org.picketlink.idm.impl.store.ldap.LDAPIdentityStoreImpl</class>
- <external-config/>
- <supported-relationship-types>
- <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type>
- </supported-relationship-types>
- <supported-identity-object-types>
- <identity-object-type>
- <name>USER</name>
- <relationships/>
- <credentials>
- <credential-type>PASSWORD</credential-type>
- </credentials>
- <attributes>
- <attribute>
- <name>phone</name>
- <mapping>telephoneNumber</mapping>
- <type>text</type>
- <isRequired>false</isRequired>
- <isMultivalued>false</isMultivalued>
- <isReadOnly>false</isReadOnly>
- </attribute>
- <attribute>
- <name>description</name>
- <mapping>description</mapping>
- <type>text</type>
- <isRequired>false</isRequired>
- <isMultivalued>false</isMultivalued>
- <isReadOnly>false</isReadOnly>
- </attribute>
- <attribute>
- <name>carLicense</name>
- <mapping>carLicense</mapping>
- <type>text</type>
- <isRequired>false</isRequired>
- <isMultivalued>false</isMultivalued>
- <isReadOnly>false</isReadOnly>
- </attribute>
- <attribute>
- <name>email</name>
- <mapping>mail</mapping>
- <type>text</type>
- <isRequired>false</isRequired>
- <isMultivalued>false</isMultivalued>
- <isReadOnly>false</isReadOnly>
- <isUnique>true</isUnique>
- </attribute>
- </attributes>
- <options>
- <option>
- <name>idAttributeName</name>
- <value>cn</value>
- </option>
- <option>
- <name>passwordAttributeName</name>
- <value>unicodePwd</value>
- </option>
- <option>
- <name>enclosePasswordWith</name>
- <value>"</value>
- </option>
- <option>
- <name>passwordEncoding</name>
- <value>UTF-16LE</value>
- </option>
- <option>
- <name>ctxDNs</name>
- <value>ou=People,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
- </option>
- <option>
- <name>allowCreateEntry</name>
- <value>true</value>
- </option>
- <option>
- <name>createEntryAttributeValues</name>
- <value>objectClass=top</value>
- <value>objectClass=inetOrgPerson</value>
- <value>sn= </value>
- <value>userAccountControl=514</value>
- <!--<value>cn= </value>-->
- </option>
- <option>
- <name>passwordUpdateAttributeValues</name>
- <value>userAccountControl=512</value>
- </option>
- </options>
- </identity-object-type>
- <identity-object-type>
- <name>ORGANIZATION</name>
- <relationships>
- <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>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>OFFICE</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options>
- <option>
- <name>idAttributeName</name>
- <value>cn</value>
- </option>
- <option>
- <name>ctxDNs</name>
- <value>ou=Organizations,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
- </option>
- <!--<option>-->
- <!--<name>entrySearchFilter</name>-->
- <!--<value></value>-->
- <!--</option>-->
- <option>
- <name>allowCreateEntry</name>
- <value>true</value>
- </option>
- <option>
- <name>parentMembershipAttributeName</name>
- <value>member</value>
- </option>
- <option>
- <name>isParentMembershipAttributeDN</name>
- <value>true</value>
- </option>
- <option>
- <name>allowEmptyMemberships</name>
- <value>true</value>
- </option>
- <option>
- <name>createEntryAttributeValues</name>
- <value>objectClass=top</value>
- <value>objectClass=group</value>
- <value>groupType=8</value>
- </option>
- </options>
- </identity-object-type>
- <identity-object-type>
- <name>ORGANIZATION_UNIT</name>
- <relationships>
- <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>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>OFFICE</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options>
- <option>
- <name>idAttributeName</name>
- <value>cn</value>
- </option>
- <option>
- <name>ctxDNs</name>
- <value>ou=OrganizationUnits,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
- </option>
- <!--<option>-->
- <!--<name>entrySearchFilter</name>-->
- <!--<value></value>-->
- <!--</option>-->
- <option>
- <name>allowCreateEntry</name>
- <value>true</value>
- </option>
- <option>
- <name>parentMembershipAttributeName</name>
- <value>member</value>
- </option>
- <option>
- <name>isParentMembershipAttributeDN</name>
- <value>true</value>
- </option>
- <option>
- <name>allowEmptyMemberships</name>
- <value>true</value>
- </option>
- <option>
- <name>createEntryAttributeValues</name>
- <value>objectClass=top</value>
- <value>objectClass=group</value>
- <value>groupType=8</value>
-
- </option>
- </options>
- </identity-object-type>
- <identity-object-type>
- <name>DEPARTMENT</name>
- <relationships>
- <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>DEPARTMENT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options>
- <option>
- <name>idAttributeName</name>
- <value>cn</value>
- </option>
- <option>
- <name>ctxDNs</name>
- <value>ou=Departments,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
- </option>
- <!--<option>-->
- <!--<name>entrySearchFilter</name>-->
- <!--<value></value>-->
- <!--</option>-->
- <option>
- <name>allowCreateEntry</name>
- <value>true</value>
- </option>
- <option>
- <name>parentMembershipAttributeName</name>
- <value>member</value>
- </option>
- <option>
- <name>isParentMembershipAttributeDN</name>
- <value>true</value>
- </option>
- <option>
- <name>allowEmptyMemberships</name>
- <value>true</value>
- </option>
- <option>
- <name>createEntryAttributeValues</name>
- <value>objectClass=top</value>
- <value>objectClass=group</value>
- <value>groupType=8</value>
- </option>
- </options>
- </identity-object-type>
- <identity-object-type>
- <name>OFFICE</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>USER</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options>
- <option>
- <name>idAttributeName</name>
- <value>cn</value>
- </option>
- <option>
- <name>ctxDNs</name>
- <value>ou=Offices,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
- </option>
- <!--<option>-->
- <!--<name>entrySearchFilter</name>-->
- <!--<value></value>-->
- <!--</option>-->
- <option>
- <name>allowCreateEntry</name>
- <value>true</value>
- </option>
- <option>
- <name>parentMembershipAttributeName</name>
- <value>member</value>
- </option>
- <option>
- <name>isParentMembershipAttributeDN</name>
- <value>true</value>
- </option>
- <option>
- <name>allowEmptyMemberships</name>
- <value>true</value>
- </option>
- <option>
- <name>createEntryAttributeValues</name>
- <value>objectClass=top</value>
- <value>objectClass=group</value>
- <value>groupType=8</value>
- </option>
- </options>
- </identity-object-type>
- <identity-object-type>
- <name>GROUP</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>USER</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options>
- <option>
- <name>idAttributeName</name>
- <value>cn</value>
- </option>
- <option>
- <name>ctxDNs</name>
- <value>ou=Groups,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
- </option>
- <!--<option>-->
- <!--<name>entrySearchFilter</name>-->
- <!--<value></value>-->
- <!--</option>-->
- <option>
- <name>allowCreateEntry</name>
- <value>true</value>
- </option>
- <option>
- <name>parentMembershipAttributeName</name>
- <value>member</value>
- </option>
- <option>
- <name>isParentMembershipAttributeDN</name>
- <value>true</value>
- </option>
- <option>
- <name>allowEmptyMemberships</name>
- <value>true</value>
- </option>
- <option>
- <name>createEntryAttributeValues</name>
- <value>objectClass=top</value>
- <value>objectClass=group</value>
- <value>groupType=8</value>
- </option>
- </options>
- </identity-object-type>
- <identity-object-type>
- <name>ROLE</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>USER</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options>
- <option>
- <name>idAttributeName</name>
- <value>cn</value>
- </option>
- <option>
- <name>ctxDNs</name>
- <value>ou=Roles,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value>
- </option>
- <!--<option>-->
- <!--<name>entrySearchFilter</name>-->
- <!--<value></value>-->
- <!--</option>-->
- <option>
- <name>allowCreateEntry</name>
- <value>true</value>
- </option>
- <option>
- <name>parentMembershipAttributeName</name>
- <value>member</value>
- </option>
- <option>
- <name>isParentMembershipAttributeDN</name>
- <value>true</value>
- </option>
- <option>
- <name>allowEmptyMemberships</name>
- <value>true</value>
- </option>
- <option>
- <name>createEntryAttributeValues</name>
- <value>objectClass=top</value>
- <value>objectClass=group</value>
- <value>groupType=8</value>
- </option>
- </options>
- </identity-object-type>
- </supported-identity-object-types>
- <options>
- <option>
- <name>providerURL</name>
- <value>ldaps://dev44.qa.atl.jboss.com:636</value>
- </option>
- <option>
- <name>adminDN</name>
- <value>JBOSS\jbossqa</value>
- </option>
- <option>
- <name>adminPassword</name>
- <value>jboss42</value>
- </option>
- <option>
- <name>authenticationMethod</name>
- <value>simple</value>
- </option>
- <!--<option>-->
- <!--<name>customSystemProperties</name>-->
- <!--<value>javax.net.ssl.trustStore=d:\Workshop\dev44-msad.truststore</value>-->
- <!--<value>javax.net.ssl.trustStorePassword=password</value>-->
- <!--</option>-->
- <option>
- <name>searchTimeLimit</name>
- <value>10000</value>
- </option>
- </options>
- </identity-store>
- </identity-stores>
- </stores>
-</jboss-identity>
\ No newline at end of file
Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends12.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends12.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends12.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://RedHat/DB</id>
Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends20.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends20.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends20.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://RedHat/DB</id>
Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://RedHat/DB</id>
Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://RedHat/DB</id>
Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://RedHat/DB</id>
Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml
===================================================================
--- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml 2009-11-19 10:48:12 UTC (rev 1034)
+++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml 2009-11-19 12:00:07 UTC (rev 1035)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1"
+<jboss-identity xmlns="urn:picketlink: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">
+ xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd">
<realms>
<realm>
<id>realm://RedHat/DB</id>
16 years, 6 months
- 1
- 0
JBoss Identity SVN: r1034 - in migration/idm/trunk/assembly: src/main and 4 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-19 05:48:12 -0500 (Thu, 19 Nov 2009)
New Revision: 1034
Modified:
migration/idm/trunk/assembly/scripts/antrun-schema.xml
migration/idm/trunk/assembly/scripts/assembly-distro.xml
migration/idm/trunk/assembly/scripts/assembly-single-jar.xml
migration/idm/trunk/assembly/src/main/build.properties
migration/idm/trunk/assembly/src/main/files/db/build.xml
migration/idm/trunk/assembly/src/main/files/jboss/build.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldb-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldburl-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mssql-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mysql-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-oracle-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-postgresql-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-sybase-ds.xml
migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml
migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml
migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml
migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml
migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml
migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml
migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml
Log:
* renaming the assembly module.
Modified: migration/idm/trunk/assembly/scripts/antrun-schema.xml
===================================================================
--- migration/idm/trunk/assembly/scripts/antrun-schema.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/scripts/antrun-schema.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -69,9 +69,9 @@
<hibernatetool destdir="${db.scripts.dir}">
<annotationconfiguration configurationfile="${config.dir}/(a){db}.hibernate.cfg.xml"/>
<hbm2ddl drop="false" create="true" export="${export}" console="false"
- outputfilename="jboss.idm.(a){db}.create.sql" delimiter=";" format="true" />
+ outputfilename="picketlink.idm.(a){db}.create.sql" delimiter=";" format="true" />
<hbm2ddl drop="true" create="false" export="${export}" console="false"
- outputfilename="jboss.idm.(a){db}.drop.sql" delimiter=";" format="true" />
+ outputfilename="picketlink.idm.(a){db}.drop.sql" delimiter=";" format="true" />
</hibernatetool>
<echo>Done.</echo>
Modified: migration/idm/trunk/assembly/scripts/assembly-distro.xml
===================================================================
--- migration/idm/trunk/assembly/scripts/assembly-distro.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/scripts/assembly-distro.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -4,12 +4,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
- <id>jbossidm.distribution</id>
+ <id>picketlink.idm.distribution</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>jbossidm-${version}</baseDirectory>
+ <baseDirectory>picketlink-idm-${version}</baseDirectory>
<!-- Dependency Sets -->
<dependencySets>
@@ -73,39 +73,39 @@
<!-- source -->
<fileSet>
- <directory>../idm-common/src/main/java</directory>
+ <directory>../picketlink-idm-common/src/main/java</directory>
<outputDirectory>src</outputDirectory>
</fileSet>
<fileSet>
- <directory>../idm-testsuite/src/main/java</directory>
+ <directory>../picketlink-idm-testsuite/src/main/java</directory>
<outputDirectory>src</outputDirectory>
</fileSet>
<fileSet>
- <directory>../idm-api/src/main/java</directory>
+ <directory>../picketlink-idm-api/src/main/java</directory>
<outputDirectory>src</outputDirectory>
</fileSet>
<fileSet>
- <directory>../idm-spi/src/main/java</directory>
+ <directory>../picketlink-idm-spi/src/main/java</directory>
<outputDirectory>src</outputDirectory>
</fileSet>
<fileSet>
- <directory>../idm-core/src/main/java</directory>
+ <directory>../picketlink-idm-core/src/main/java</directory>
<outputDirectory>src</outputDirectory>
</fileSet>
<fileSet>
- <directory>../idm-hibernate/src/main/java</directory>
+ <directory>../picketlink-idm-hibernate/src/main/java</directory>
<outputDirectory>src</outputDirectory>
</fileSet>
<fileSet>
- <directory>../idm-ldap/src/main/java</directory>
+ <directory>../picketlink-idm-ldap/src/main/java</directory>
<outputDirectory>src</outputDirectory>
</fileSet>
<fileSet>
- <directory>../idm-cache/src/main/java</directory>
+ <directory>../picketlink-idm-cache/src/main/java</directory>
<outputDirectory>src</outputDirectory>
</fileSet>
<fileSet>
- <directory>../idm-auth/src/main/java</directory>
+ <directory>../picketlink-idm-auth/src/main/java</directory>
<outputDirectory>src</outputDirectory>
</fileSet>
<fileSet>
Modified: migration/idm/trunk/assembly/scripts/assembly-single-jar.xml
===================================================================
--- migration/idm/trunk/assembly/scripts/assembly-single-jar.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/scripts/assembly-single-jar.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -5,35 +5,35 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>${basedir}/../idm-common/target/classes</directory>
+ <directory>${basedir}/../picketlink-idm-common/target/classes</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>${basedir}/../idm-spi/target/classes</directory>
+ <directory>${basedir}/../picketlink-idm-spi/target/classes</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>${basedir}/../idm-api/target/classes</directory>
+ <directory>${basedir}/../picketlink-idm-api/target/classes</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>${basedir}/../idm-core/target/classes/</directory>
+ <directory>${basedir}/../picketlink-idm-core/target/classes/</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>${basedir}/../idm-cache/target/classes/</directory>
+ <directory>${basedir}/../picketlink-idm-cache/target/classes/</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>${basedir}/../idm-hibernate/target/classes/</directory>
+ <directory>${basedir}/../picketlink-idm-hibernate/target/classes/</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>${basedir}/../idm-ldap/target/classes/</directory>
+ <directory>${basedir}/../picketlink-idm-ldap/target/classes/</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>${basedir}/../idm-auth/target/classes/</directory>
+ <directory>${basedir}/../picketlink-idm-auth/target/classes/</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
Modified: migration/idm/trunk/assembly/src/main/build.properties
===================================================================
--- migration/idm/trunk/assembly/src/main/build.properties 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/build.properties 2009-11-19 10:48:12 UTC (rev 1034)
@@ -1,4 +1,4 @@
-jbossidm.home=..
+picketlink.idm.home=..
database=hsqldburl
-jboss.home=/local/deploy/jboss-5.0.1.GA
+jboss.home=/local/deploy/jboss-5.1.0.GA
jboss.server.configuration=default
\ No newline at end of file
Modified: migration/idm/trunk/assembly/src/main/files/db/build.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/db/build.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/db/build.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="jbossidm.db.install">
+<project name="picketlink.idm.db.install">
<!-- DEVELOPER SPECIFIC CONFIGURATIONS -->
<property file="../build.properties" />
<!-- JDBC PROPERTIES -->
- <property file="${jbossidm.home}/db/jdbc/${database}.properties" />
+ <property file="${picketlink.idm.home}/db/jdbc/${database}.properties" />
<!-- ### LOG PROPERTIES ################################################# -->
<target name="log.properties">
@@ -14,21 +14,21 @@
<echo message="jdbc.driver.... ${jdbc.driver}" />
<echo message="jdbc.url....... ${jdbc.url}" />
<echo message="jdbc.username.. ${jdbc.username}" />
- <echo message="jbossidm.home...... ${jbossidm.home}" />
+ <echo message="picketlink.idm.home...... ${picketlink.idm.home}" />
</target>
<!-- ### CREATE JBPM SCHEMA ############################################# -->
- <target name="create.jbossidm.schema"
+ <target name="create.picketlink.idm.schema"
depends="log.properties"
- description="creates the jbossidm tables in the database">
+ description="creates the picketlink idm tables in the database">
<sql driver="${jdbc.driver}"
url="${jdbc.url}"
userid="${jdbc.username}"
password="${jdbc.password}"
onerror="continue">
- <transaction src="${jbossidm.home}/db/schema.scripts/jboss.idm.${database}.create.sql"/>
+ <transaction src="${picketlink.idm.home}/db/schema.scripts/picketlink.idm.${database}.create.sql"/>
<classpath>
- <fileset dir="${jbossidm.home}/lib">
+ <fileset dir="${picketlink.idm.home}/lib">
<include name="*.jar"/>
</fileset>
</classpath>
@@ -44,9 +44,9 @@
userid="${jdbc.username}"
password="${jdbc.password}"
onerror="continue">
- <transaction src="${jbossidm.home}/db/schema.scripts/jboss.idm.${database}.drop.sql"/>
+ <transaction src="${picketlink.idm.home}/db/schema.scripts/picketlink.idm.${database}.drop.sql"/>
<classpath>
- <fileset dir="${jbossidm.home}/lib">
+ <fileset dir="${picketlink.idm.home}/lib">
<include name="*.jar"/>
</fileset>
</classpath>
@@ -60,7 +60,7 @@
<java classname="org.hsqldb.util.DatabaseManager" fork="true">
<arg line="-url jdbc:hsqldb:hsql://localhost:1701"/>
<classpath>
- <fileset dir="${jbossidm.home}/lib">
+ <fileset dir="${picketlink.idm.home}/lib">
<include name="hsqldb.jar"/>
</fileset>
</classpath>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/build.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/build.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/build.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -1,124 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="jbossidm.jboss.install" default="deploy">
+<project name="picketlink.idm.jboss.install" default="deploy">
<!-- DEVELOPER SPECIFIC CONFIGURATIONS -->
<property file="../build.properties" />
<!-- JDBC PROPERTIES -->
- <property file="${jbossidm.home}/db/jdbc/${database}.properties" />
+ <property file="${picketlink.idm.home}/db/jdbc/${database}.properties" />
<property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" />
<!-- ### LOG PROPERTIES ################################################# -->
<target name="log.properties">
<echo message="database.................... ${database}" />
- <echo message="jbossidm.home................... ${jbossidm.home}" />
+ <echo message="picketlink.idm.home................... ${picketlink.idm.home}" />
<echo message="jboss.home.................. ${jboss.home}" />
<echo message="jboss.server.configuration.. ${jboss.server.configuration}" />
<echo message="jboss.server.config.dir..... ${jboss.server.config.dir}" />
</target>
- <!-- ### MAIN TARGET TO INSTALL jbossidm INTO JBOSS ######################### -->
+ <!-- ### MAIN TARGET TO INSTALL picketlink idm INTO JBOSS ######################### -->
<target name="deploy"
depends="log.properties"
- description="installs jbossidm into jboss">
- <antcall target="internal.install.jbossidm.into.jboss5" />
- <antcall target="internal.install.jbossidm.into.jboss.db.${database}" />
+ description="installs picketlink idm into jboss">
+ <antcall target="internal.install.picketlink.idm.into.jboss5" />
+ <antcall target="internal.install.picketlink.idm.into.jboss.db.${database}" />
</target>
- <target name="undeploy" description="uninstall jbossidm from jboss">
- <delete dir="${jboss.server.config.dir}/deploy/idm" />
- <delete dir="${jboss.server.config.dir}/deployers/idm-deployer" />
+ <target name="undeploy" description="uninstall picketlink.idm from jboss">
+ <delete dir="${jboss.server.config.dir}/deploy/picketlink-idm" />
+ <delete dir="${jboss.server.config.dir}/deployers/picketlink-idm.deployer" />
</target>
<!-- ### THE JBOSS GENERIC PART ######################################### -->
- <target name="internal.install.jbossidm.into.jboss5">
+ <target name="internal.install.picketlink.idm.into.jboss5">
- <copy todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" overwrite="true">
- <fileset dir="${jbossidm.home}/modules/idm-service.sar" />
+ <copy todir="${jboss.server.config.dir}/deploy/picketlink-idm/picketlink-idm-service.sar" overwrite="true">
+ <fileset dir="${picketlink.idm.home}/modules/picketlink-idm-service.sar" />
</copy>
<!-- ### Update the default-jboss-idm.xml #### -->
- <copy file="${jbossidm.home}/modules/idm-service.sar/META-INF/default-jboss-idm.xml"
- toFile="${jboss.server.config.dir}/deploy/idm/idm-service.sar/META-INF/default-jboss-idm.xml"
+ <copy file="${picketlink.idm.home}/modules/picketlink-idm-service.sar/META-INF/default-picketlink-idm.xml"
+ toFile="${jboss.server.config.dir}/deploy/picketlink-idm/picketlink-idm-service.sar/META-INF/default-picketlink-idm.xml"
overwrite="true">
<filterset>
<filter token="database" value="${database}"/>
</filterset>
</copy>
- <copy todir="${jboss.server.config.dir}/deployers/idm-deployer" overwrite="true">
- <fileset dir="${jbossidm.home}/modules/idm-deployer" />
+ <copy todir="${jboss.server.config.dir}/deployers/picketlink-idm.deployer" overwrite="true">
+ <fileset dir="${picketlink.idm.home}/modules/picketlink-idm.deployer" />
</copy>
<!-- copy the sql scripts -->
- <copy todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar/idm-sql">
- <fileset dir="${jbossidm.home}/db/schema.scripts">
+ <copy todir="${jboss.server.config.dir}/deploy/picketlink-idm/picketlink-idm-service.sar/idm-sql">
+ <fileset dir="${picketlink.idm.home}/db/schema.scripts">
<include name="*.sql"/>
</fileset>
</copy>
<!-- copy the right hibernate configuration file -->
- <copy file="${jbossidm.home}/jboss/hibernate.cfg/${database}.hibernate.cfg.xml"
- tofile="${jboss.server.config.dir}/deploy/idm/idm-service.sar/jboss.idm.hibernate.cfg.xml"
+ <copy file="${picketlink.idm.home}/jboss/hibernate.cfg/${database}.hibernate.cfg.xml"
+ tofile="${jboss.server.config.dir}/deploy/picketlink-idm/picketlink-idm-service.sar/jboss.idm.hibernate.cfg.xml"
overwrite="true" />
<!-- copy the right datasource configuration file and replace the jdbc properties with
the values in the jdbc/${database}.properties file -->
- <copy todir="${jboss.server.config.dir}/deploy/idm" overwrite="true">
- <filterset filtersfile="${jbossidm.home}/db/jdbc/${database}.properties" />
- <fileset dir="${jbossidm.home}/jboss/datasources">
- <include name="jbidm-${database}-ds.xml"/>
+ <copy todir="${jboss.server.config.dir}/deploy/picketlink-idm" overwrite="true">
+ <filterset filtersfile="${picketlink.idm.home}/db/jdbc/${database}.properties" />
+ <fileset dir="${picketlink.idm.home}/jboss/datasources">
+ <include name="picketlink-idm-${database}-ds.xml"/>
</fileset>
</copy>
</target>
<!-- ### THE HSQLDB SPECIFIC PART ####################################### -->
- <target name="internal.install.jbossidm.into.jboss.db.hsqldb" />
+ <target name="internal.install.picketlink.idm.into.jboss.db.hsqldb" />
- <target name="internal.install.jbossidm.into.jboss.db.hsqldburl" />
+ <target name="internal.install.picketlink.idm.into.jboss.db.hsqldburl" />
<!-- ### THE MYSQL SPECIFIC PART ####################################### -->
- <target name="internal.install.jbossidm.into.jboss.db.mysql">
- <copy todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" overwrite="true">
- <fileset dir="${jbossidm.home}/lib">
+ <target name="internal.install.picketlink.idm.into.jboss.db.mysql">
+ <copy todir="${jboss.server.config.dir}/deploy/picketlink-idm/picketlink-idm-service.sar" overwrite="true">
+ <fileset dir="${picketlink.idm.home}/lib">
<include name="mysql-connector-java-*.jar"/>
</fileset>
</copy>
</target>
<!-- ### THE ORACLE SPECIFIC PART ####################################### -->
- <target name="internal.install.jbossidm.into.jboss.db.oracle">
- <available file="${jbossidm.home}/lib/ojdbc14.jar" property="oracle.driver.jar.available" />
- <fail message="please download the oracle driver jar ojdbc14.jar from oracle and put it in the ${jbossidm.home}/lib directory" unless="oracle.driver.jar.available" />
- <copy file="${jbossidm.home}/lib/ojdbc14.jar"
- todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" />
+ <target name="internal.install.picketlink.idm.into.jboss.db.oracle">
+ <available file="${picketlink.idm.home}/lib/ojdbc14.jar" property="oracle.driver.jar.available" />
+ <fail message="please download the oracle driver jar ojdbc14.jar from oracle and put it in the ${picketlink.idm.home}/lib directory" unless="oracle.driver.jar.available" />
+ <copy file="${picketlink.idm.home}/lib/ojdbc14.jar"
+ todir="${jboss.server.config.dir}/deploy/picketlink-idm/picketlink-idm-service.sar" />
</target>
<!-- ### THE POSTGRESQL SPECIFIC PART ################################### -->
- <target name="internal.install.jbossidm.into.jboss.db.postgresql">
- <copy todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" overwrite="true">
- <fileset dir="${jbossidm.home}/lib">
+ <target name="internal.install.picketlink.idm.into.jboss.db.postgresql">
+ <copy todir="${jboss.server.config.dir}/deploy/picketlink-idm/picketlink-idm-service.sar" overwrite="true">
+ <fileset dir="${picketlink.idm.home}/lib">
<include name="postgresql-*.jar"/>
</fileset>
</copy>
</target>
<!--### THE SYBASE SPECIFIC PART ######################################## -->
- <target name="internal.install.jbossidm.into.jboss.db.sybase">
- <copy todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" overwrite="true">
- <fileset dir="${jbossidm.home}/lib">
+ <target name="internal.install.picketlink.idm.into.jboss.db.sybase">
+ <copy todir="${jboss.server.config.dir}/deploy/picketlink-idm/picketlink-idm-service.sar" overwrite="true">
+ <fileset dir="${picketlink.idm.home}/lib">
<include name="jtds-*.jar"/>
</fileset>
</copy>
</target>
<!--### THE MSSQL SPECIFIC PART ######################################## -->
- <target name="internal.install.jbossidm.into.jboss.db.mssql">
- <copy todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" overwrite="true">
- <fileset dir="${jbossidm.home}/lib">
+ <target name="internal.install.picketlink.idm.into.jboss.db.mssql">
+ <copy todir="${jboss.server.config.dir}/deploy/picketlink-idm/picketlink-idm-service.sar" overwrite="true">
+ <fileset dir="${picketlink.idm.home}/lib">
<include name="jtds-*.jar"/>
</fileset>
</copy>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldb-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldb-ds.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldb-ds.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -2,7 +2,7 @@
<datasources>
<local-tx-datasource>
- <jndi-name>jbossidmDS</jndi-name>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
<connection-url>jdbc:hsqldb:hsql://localhost:1701</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldburl-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldburl-ds.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-hsqldburl-ds.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -2,7 +2,7 @@
<datasources>
<local-tx-datasource>
- <jndi-name>jbossidmDS</jndi-name>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
<connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbossidm</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mssql-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mssql-ds.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mssql-ds.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -2,7 +2,7 @@
<datasources>
<local-tx-datasource>
- <jndi-name>jbossidmDS</jndi-name>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
<connection-url>@jdbc.url@</connection-url>
<driver-class>@jdbc.driver@</driver-class>
<user-name>@jdbc.username@</user-name>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mysql-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mysql-ds.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mysql-ds.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<datasources>
<local-tx-datasource>
- <jndi-name>jbossidmDS</jndi-name>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
<connection-url>@jdbc.url@</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-oracle-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-oracle-ds.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-oracle-ds.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -2,7 +2,7 @@
<datasources>
<local-tx-datasource>
- <jndi-name>jbossidmDS</jndi-name>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
<connection-url>@jdbc.url@</connection-url>
<driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
<user-name>@jdbc.username@</user-name>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-postgresql-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-postgresql-ds.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-postgresql-ds.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -2,7 +2,7 @@
<datasources>
<local-tx-datasource>
- <jndi-name>jbossidmDS</jndi-name>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
<connection-url>@jdbc.url@</connection-url>
<driver-class>org.postgresql.Driver</driver-class>
<user-name>@jdbc.username@</user-name>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-sybase-ds.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-sybase-ds.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-sybase-ds.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -2,7 +2,7 @@
<datasources>
<local-tx-datasource>
- <jndi-name>jbossidmDS</jndi-name>
+ <jndi-name>PicketLinkIDMDS</jndi-name>
<connection-url>@jdbc.url@</connection-url>
<driver-class>@jdbc.driver@</driver-class>
<user-name>@jdbc.username@</user-name>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -37,7 +37,7 @@
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
<property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
- <property name="hibernate.connection.datasource">java:jbossidmDS</property>
+ <property name="hibernate.connection.datasource">java:PicketLinkIDMDS</property>
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="jta.UserTransaction">UserTransaction</property>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -37,7 +37,7 @@
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
<property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
- <property name="hibernate.connection.datasource">java:jbossidmDS</property>
+ <property name="hibernate.connection.datasource">java:PicketLinkIDMDS</property>
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="jta.UserTransaction">UserTransaction</property>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -37,7 +37,7 @@
<!-- property name="hibernate.hbm2ddl.auto">create-drop</property-->
<property name="hibernate.dialect">org.hibernate.dialect.SQLServerDialect</property>
- <property name="hibernate.connection.datasource">java:jbossidmDS</property>
+ <property name="hibernate.connection.datasource">java:PicketLinkIDMDS</property>
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="jta.UserTransaction">UserTransaction</property>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -36,7 +36,7 @@
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
<property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
- <property name="hibernate.connection.datasource">java:jbossidmDS</property>
+ <property name="hibernate.connection.datasource">java:PicketLinkIDMDS</property>
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="jta.UserTransaction">UserTransaction</property>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -37,7 +37,7 @@
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
<property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property>
- <property name="hibernate.connection.datasource">java:jbossidmDS</property>
+ <property name="hibernate.connection.datasource">java:PicketLinkIDMDS</property>
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="jta.UserTransaction">UserTransaction</property>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -37,7 +37,7 @@
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
<property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
- <property name="hibernate.connection.datasource">java:jbossidmDS</property>
+ <property name="hibernate.connection.datasource">java:PicketLinkIDMDS</property>
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="jta.UserTransaction">UserTransaction</property>
Modified: migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml
===================================================================
--- migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033)
+++ migration/idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-19 10:48:12 UTC (rev 1034)
@@ -37,7 +37,7 @@
<!-- property name="hibernate.hbm2ddl.auto">create-drop</property-->
<property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property>
- <property name="hibernate.connection.datasource">java:jbossidmDS</property>
+ <property name="hibernate.connection.datasource">java:PicketLinkIDMDS</property>
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="jta.UserTransaction">UserTransaction</property>
16 years, 6 months
- 1
- 0