Author: jeff.yuchang Date: 2009-11-19 05:40:13 -0500 (Thu, 19 Nov 2009) New Revision: 1033 Added: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml migration/idm/trunk/integration/deployer/src/main/resources/picketlink-idm-hsqldb-ds.xml migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.cfg.xml migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.hibernate.cfg.xml migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.picketlink.idm.cfg.xml migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml Removed: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml migration/idm/trunk/integration/deployer/src/main/resources/META-INF/idm-deployer-jboss-beans.xml migration/idm/trunk/integration/deployer/src/main/resources/jbidm-hsqldb-ds.xml migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml Modified: migration/idm/trunk/integration/deployer/pom.xml migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java migration/idm/trunk/integration/deployer/src/main/resources/META-INF/jboss-dependency.xml migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd migration/idm/trunk/integration/deployer/src/main/resources/idm-assembly.xml Log: * renaming the integration module, include the datasource, configuration file etc. Modified: migration/idm/trunk/integration/deployer/pom.xml =================================================================== --- migration/idm/trunk/integration/deployer/pom.xml 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/deployer/pom.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -127,7 +127,7 @@ <goal>single</goal> </goals> <configuration> - <finalName>picketlink-idm-deployer</finalName> + <finalName>picketlink-idm.deployer</finalName> <appendAssemblyId>true</appendAssemblyId> <descriptors> <descriptor>src/main/resources/deployer-assembly.xml</descriptor> Modified: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java 2009-11-19 10:40:13 UTC (rev 1033) @@ -31,7 +31,7 @@ @XmlRegistry public class ObjectFactory { - private final static QName _JbossIdmDeployer_QNAME = new QName("urn:jboss:identity:idm:deployer:v1_0_beta", "jboss-idm-deployer"); + private final static QName _JbossIdmDeployer_QNAME = new QName("urn:org:picketlink:idm:deployer:v1_0_CR1", "picketlink-idm-deployer"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.picketlink.idm.integration.jboss5.jaxb2 Modified: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java 2009-11-19 10:40:13 UTC (rev 1033) @@ -5,5 +5,5 @@ // Generated on: 2009.05.28 at 11:27:34 PM CST // -(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:identity:idm:deployer:v1_0_beta", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:org:picketlink:idm:deployer:v1_0_CR1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.picketlink.idm.integration.jboss5.jaxb2; Deleted: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd"> - <JNDIName>java:/IdentitySessionFactory</JNDIName> - <idmConfigFile>jboss.idm.cfg.xml</idmConfigFile> - <hibernateDeployer> - <hibernateConfiguration>jboss.idm.hibernate.cfg.xml</hibernateConfiguration> - <hibernateSessionFactoryJNDIName>java:/IDMHibernateSessionFactory</hibernateSessionFactoryJNDIName> - </hibernateDeployer> - <initializers> - <datasource>java:/jbossidmDS</datasource> - <sqlInitializer> - <sqlFile>idm-sql/jboss.idm.@database@.create.sql</sqlFile> - <exitSQL>select * from jbid_io</exitSQL> - </sqlInitializer> - <!-- hibernateInitializer> - <doChecking>true</doChecking> - </hibernateInitializer--> - </initializers> -</jboss-idm-deployer> Copied: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml) =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml (rev 0) +++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd"> + <JNDIName>java:/IdentitySessionFactory</JNDIName> + <idmConfigFile>picketlink.idm.cfg.xml</idmConfigFile> + <hibernateDeployer> + <hibernateConfiguration>picketlink.idm.hibernate.cfg.xml</hibernateConfiguration> + <hibernateSessionFactoryJNDIName>java:/IDMHibernateSessionFactory</hibernateSessionFactoryJNDIName> + </hibernateDeployer> + <initializers> + <datasource>java:/PicketLinkIDMDS</datasource> + <sqlInitializer> + <sqlFile>idm-sql/picketlink.idm.@database@.create.sql</sqlFile> + <exitSQL>select * from jbid_io</exitSQL> + </sqlInitializer> + <!-- hibernateInitializer> + <doChecking>true</doChecking> + </hibernateInitializer--> + </initializers> +</jboss-idm-deployer> Deleted: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/idm-deployer-jboss-beans.xml =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/idm-deployer-jboss-beans.xml 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/idm-deployer-jboss-beans.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- - The JBoss IDM Meta Data Deployer - --> - <bean name="org.picketlink.idm:service=MetaDataDeployer" - class="org.picketlink.idm.integration.jboss5.IDMConfigParsingDeployer"> - - <property name="suffix">-jboss-idm.xml</property> - <property name="allowMultipleFiles">true</property> - </bean> - - <!-- - The actual IDM Deployer - --> - <bean name="org.picketlink.idm:service=Deployer" - class="org.picketlink.idm.integration.jboss5.IDMDeployer"> - <property name="transactionManager"> - <inject bean="RealTransactionManager" option="callback"/> - </property> - </bean> - -</deployment> \ No newline at end of file Modified: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/jboss-dependency.xml =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/jboss-dependency.xml 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/jboss-dependency.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -1,3 +1,3 @@ <dependency xmlns="urn:jboss:dependency:1.0"> - <item whenRequired="Real" dependentState="Installed">jboss.jca:service=DataSourceBinding,name=jbossidmDS</item> + <item whenRequired="Real" dependentState="Installed">jboss.jca:service=DataSourceBinding,name=PicketLinkIDMDS</item> </dependency> \ No newline at end of file Copied: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/main/resources/META-INF/idm-deployer-jboss-beans.xml) =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml (rev 0) +++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + The JBoss IDM Meta Data Deployer + --> + <bean name="org.picketlink.idm:service=MetaDataDeployer" + class="org.picketlink.idm.integration.jboss5.IDMConfigParsingDeployer"> + + <property name="suffix">-jboss-idm.xml</property> + <property name="allowMultipleFiles">true</property> + </bean> + + <!-- + The actual IDM Deployer + --> + <bean name="org.picketlink.idm:service=Deployer" + class="org.picketlink.idm.integration.jboss5.IDMDeployer"> + <property name="transactionManager"> + <inject bean="RealTransactionManager" option="callback"/> + </property> + </bean> + +</deployment> \ No newline at end of file Modified: migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd 2009-11-19 10:40:13 UTC (rev 1033) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:jboss:identity:idm:deployer:v1_0_beta" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="jboss-idm-deployer" type="urn:jbossIDMDeployerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta"> +<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:org:picketlink:idm:deployer:v1_0_CR1" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:element name="picketlink-idm-deployer" type="urn:picketlinkIDMDeployerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1"> <xs:annotation> - <xs:documentation>&lt;xs:schemaattributeFormDefault="unqualifi... + <xs:documentation>&lt;xs:schemaattributeFormDefault="unqualifi... </xs:annotation> </xs:element> - <xs:complexType name="jbossIDMDeployerType"> + <xs:complexType name="picketlinkIDMDeployerType"> <xs:sequence> <xs:element name="JNDIName" type="xs:string" /> <xs:element name="idmConfigFile" type="xs:string" /> - <xs:element name="hibernateDeployer" minOccurs="0" type="urn:hibernateDeployerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta"/> - <xs:element name="initializers" minOccurs="0" type="urn:initializerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta"/> - <xs:element name="options" minOccurs="0" type="urn:optionsType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta"/> + <xs:element name="hibernateDeployer" minOccurs="0" type="urn:hibernateDeployerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1"/> + <xs:element name="initializers" minOccurs="0" type="urn:initializerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1"/> + <xs:element name="options" minOccurs="0" type="urn:optionsType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1"/> <xs:element name="depends" type="xs:string" minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> </xs:complexType> @@ -21,8 +21,8 @@ <xs:sequence> <xs:element name="datasource" type="xs:string" /> <xs:choice> - <xs:element name="sqlInitializer" type="urn:sqlInitializerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta" /> - <xs:element name="hibernateInitializer" type="urn:hibernateInitializerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta" /> + <xs:element name="sqlInitializer" type="urn:sqlInitializerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1" /> + <xs:element name="hibernateInitializer" type="urn:hibernateInitializerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1" /> </xs:choice> </xs:sequence> </xs:complexType> @@ -43,7 +43,7 @@ <xs:complexType name="optionsType"> <xs:sequence> - <xs:element name="option" type="urn:optionType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta" maxOccurs="unbounded" /> + <xs:element name="option" type="urn:optionType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1" maxOccurs="unbounded" /> </xs:sequence> </xs:complexType> Modified: migration/idm/trunk/integration/deployer/src/main/resources/idm-assembly.xml =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/idm-assembly.xml 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/deployer/src/main/resources/idm-assembly.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -10,11 +10,10 @@ <directory>${project.build.outputDirectory}</directory> <outputDirectory>/</outputDirectory> <includes> - <include>jboss.idm.cfg.xml</include> - <include>jboss.idm.hibernate.cfg.xml</include> - <include>META-INF/default-jboss-idm.xml</include> + <include>picketlink.idm.cfg.xml</include> + <include>picketlink.idm.hibernate.cfg.xml</include> + <include>META-INF/default-picketlink-idm.xml</include> <include>META-INF/jboss-dependency.xml</include> - <include>setupdata.txt</include> </includes> </fileSet> </fileSets> Deleted: migration/idm/trunk/integration/deployer/src/main/resources/jbidm-hsqldb-ds.xml =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/jbidm-hsqldb-ds.xml 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/deployer/src/main/resources/jbidm-hsqldb-ds.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<datasources> - - <local-tx-datasource> - <jndi-name>jbossidmDS</jndi-name> - - <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbossidm</connection-url> - <driver-class>org.hsqldb.jdbcDriver</driver-class> - <user-name>sa</user-name> - <password></password> - - <!-- connection pool parameters --> - <min-pool-size>1</min-pool-size> - <max-pool-size>5</max-pool-size> - - <!-- disable idle connection removal, hsqldb does not reap threads on closed connections --> - <idle-timeout-minutes>0</idle-timeout-minutes> - <!-- check all statements are closed when the connection is returned to the pool --> - <track-statements /> - <!-- hsqldb benefits from prepared statement caching --> - <prepared-statement-cache-size>32</prepared-statement-cache-size> - - <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml --> - <metadata> - <type-mapping>Hypersonic SQL</type-mapping> - </metadata> - - <!-- ensure the datasource is not initialized before the database itself --> - <depends>jboss:service=Hypersonic,database=jbossidm</depends> - </local-tx-datasource> - - <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbossidm"> - <attribute name="Database">jbossidm</attribute> - <attribute name="InProcessMode">true</attribute> - </mbean> - -</datasources> \ No newline at end of file Deleted: migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -1,127 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> - <realms> - <realm> - <id>realm://JBossIdentity</id> - <repository-id-ref>JBoss_Identity_Repository</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - </realms> - <repositories> - <repository> - <id>JBoss_Identity_Repository</id> - <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>Identity_DB_Store</default-identity-store-id> - <default-attribute-store-id>Identity_DB_Store</default-attribute-store-id> - </repository> - </repositories> - <stores> - <attribute-stores/> - <identity-stores> - <identity-store> - <id>Identity_DB_Store</id> - <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>USER</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>GROUP</identity-object-type-ref> - </relationship> - </relationships> - <credentials> - <credential-type>PASSWORD</credential-type> - </credentials> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>ORGANIZATION</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>USER</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>USER</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>GROUP</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>GROUP</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>USER</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>USER</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>GROUP</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - </supported-identity-object-types> - <options> - <option> - <name>hibernateSessionFactoryJNDIName</name> - <value>java:/IDMHibernateSessionFactory</value> - </option> - <option> - <name>addHibernateMappings</name> - <value>false</value> - </option> - <option> - <name>populateRelationshipTypes</name> - <value>true</value> - </option> - <option> - <name>populateIdentityObjectTypes</name> - <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - <option> - <name>allowNotDefinedIdentityObjectTypes</name> - <value>true</value> - </option> - <option> - <name>manageTransactionDuringBootstrap</name> - <value>false</value> - </option> - <option> - <name>isRealmAware</name> - <value>true</value> - </option> - </options> - </identity-store> - </identity-stores> - </stores> -</jboss-identity> Deleted: migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -1,64 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated by the @authors tag. See the ~ - ~ copyright.txt in the distribution for a full listing of ~ - ~ individual contributors. ~ - ~ ~ - ~ This is free software; you can redistribute it and/or modify it ~ - ~ under the terms of the GNU Lesser General Public License as ~ - ~ published by the Free Software Foundation; either version 2.1 of ~ - ~ the License, or (at your option) any later version. ~ - ~ ~ - ~ This software is distributed in the hope that it will be useful, ~ - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ - ~ Lesser General Public License for more details. ~ - ~ ~ - ~ You should have received a copy of the GNU Lesser General Public ~ - ~ License along with this software; if not, write to the Free ~ - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> -<hibernate-configuration> - <session-factory> - - <property name="show_sql">false</property> - <property name="cache.use_second_level_cache">true</property> - <property name="cache.use_query_cache">true</property> - - <property name="current_session_context_class">thread</property> - - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - - <!--<property name="connection.datasource"></property>--> - - <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbossidm</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> - <!--<mapping resource="mappings/HibernateRealm.hbm.xml"/>--> - <!--<mapping resource="mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml"/>--> - <!--<mapping resource="mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml"/>--> - <!--<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>--> - <!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>--> - <!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>--> - <!--<mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>--> - <!--<mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>--> - <!--<mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>--> - <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>--> - <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>--> - - </session-factory> -</hibernate-configuration> \ No newline at end of file Copied: migration/idm/trunk/integration/deployer/src/main/resources/picketlink-idm-hsqldb-ds.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/main/resources/jbidm-hsqldb-ds.xml) =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/picketlink-idm-hsqldb-ds.xml (rev 0) +++ migration/idm/trunk/integration/deployer/src/main/resources/picketlink-idm-hsqldb-ds.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <local-tx-datasource> + <jndi-name>jbossidmDS</jndi-name> + + <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbossidm</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + + <!-- connection pool parameters --> + <min-pool-size>1</min-pool-size> + <max-pool-size>5</max-pool-size> + + <!-- disable idle connection removal, hsqldb does not reap threads on closed connections --> + <idle-timeout-minutes>0</idle-timeout-minutes> + <!-- check all statements are closed when the connection is returned to the pool --> + <track-statements /> + <!-- hsqldb benefits from prepared statement caching --> + <prepared-statement-cache-size>32</prepared-statement-cache-size> + + <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml --> + <metadata> + <type-mapping>Hypersonic SQL</type-mapping> + </metadata> + + <!-- ensure the datasource is not initialized before the database itself --> + <depends>jboss:service=Hypersonic,database=jbossidm</depends> + </local-tx-datasource> + + <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbossidm"> + <attribute name="Database">jbossidm</attribute> + <attribute name="InProcessMode">true</attribute> + </mbean> + +</datasources> \ No newline at end of file Copied: migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.cfg.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml) =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.cfg.xml (rev 0) +++ migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -0,0 +1,127 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + <realms> + <realm> + <id>realm://JBossIdentity</id> + <repository-id-ref>JBoss_Identity_Repository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + </realms> + <repositories> + <repository> + <id>JBoss_Identity_Repository</id> + <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Identity_DB_Store</default-identity-store-id> + <default-attribute-store-id>Identity_DB_Store</default-attribute-store-id> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>Identity_DB_Store</id> + <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>GROUP</identity-object-type-ref> + </relationship> + </relationships> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>ORGANIZATION</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>GROUP</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>GROUP</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>GROUP</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>hibernateSessionFactoryJNDIName</name> + <value>java:/IDMHibernateSessionFactory</value> + </option> + <option> + <name>addHibernateMappings</name> + <value>false</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>manageTransactionDuringBootstrap</name> + <value>false</value> + </option> + <option> + <name>isRealmAware</name> + <value>true</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> +</jboss-identity> Copied: migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.hibernate.cfg.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml) =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.hibernate.cfg.xml (rev 0) +++ migration/idm/trunk/integration/deployer/src/main/resources/picketlink.idm.hibernate.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -0,0 +1,64 @@ +<?xml version='1.0' encoding='utf-8'?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> +<hibernate-configuration> + <session-factory> + + <property name="show_sql">false</property> + <property name="cache.use_second_level_cache">true</property> + <property name="cache.use_query_cache">true</property> + + <property name="current_session_context_class">thread</property> + + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> + + <!--<property name="connection.datasource"></property>--> + + <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbossidm</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <!--<mapping resource="mappings/HibernateRealm.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>--> + + </session-factory> +</hibernate-configuration> \ No newline at end of file Deleted: migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml =================================================================== --- migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd"> - <JNDIName>java:/jbpmIdentitySessionFactory</JNDIName> - <idmConfigFile>jbpm.idm.cfg.xml</idmConfigFile> -</jboss-idm-deployer> Copied: migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml) =================================================================== --- migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml (rev 0) +++ migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd"> + <JNDIName>java:/jbpmIdentitySessionFactory</JNDIName> + <idmConfigFile>jbpm.idm.cfg.xml</idmConfigFile> +</jboss-idm-deployer> Deleted: migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml =================================================================== --- migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> - <realms> - <realm> - <id>realm://jbpmIdentity</id> - <repository-id-ref>jbpm_Identity_Repository</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - </realms> - <repositories> - <repository> - <id>jbpm_Identity_Repository</id> - <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>jbpm_Identity_DB_Store</default-identity-store-id> - <default-attribute-store-id>jbpm_Identity_DB_Store</default-attribute-store-id> - </repository> - </repositories> - <stores> - <attribute-stores/> - <identity-stores> - <identity-store> - <id>jbpm_Identity_DB_Store</id> - <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>USER</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>unit</identity-object-type-ref> - </relationship> - </relationships> - <credentials> - <credential-type>PASSWORD</credential-type> - </credentials> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>unit</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>USER</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>USER</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>unit</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - </supported-identity-object-types> - <options> - <option> - <name>hibernateSessionFactoryJNDIName</name> - <value>java:/IDMHibernateSessionFactory</value> - </option> - <option> - <name>populateRelationshipTypes</name> - <value>true</value> - </option> - <option> - <name>populateIdentityObjectTypes</name> - <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - <option> - <name>isRealmAware</name> - <value>true</value> - </option> - </options> - </identity-store> - </identity-stores> - </stores> -</jboss-identity> Copied: migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.picketlink.idm.cfg.xml (from rev 1031, migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml) =================================================================== --- migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.picketlink.idm.cfg.xml (rev 0) +++ migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.picketlink.idm.cfg.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + <realms> + <realm> + <id>realm://jbpmIdentity</id> + <repository-id-ref>jbpm_Identity_Repository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + </realms> + <repositories> + <repository> + <id>jbpm_Identity_Repository</id> + <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>jbpm_Identity_DB_Store</default-identity-store-id> + <default-attribute-store-id>jbpm_Identity_DB_Store</default-attribute-store-id> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>jbpm_Identity_DB_Store</id> + <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>unit</identity-object-type-ref> + </relationship> + </relationships> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>unit</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>unit</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>hibernateSessionFactoryJNDIName</name> + <value>java:/IDMHibernateSessionFactory</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + <option> + <name>isRealmAware</name> + <value>true</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> +</jboss-identity> Deleted: migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml =================================================================== --- migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml 2009-11-19 04:40:56 UTC (rev 1032) +++ migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- - IDM Service - --> - <bean name="jboss.identity.IDMService" - class="org.picketlink.idm.integration.jboss5.IDMService"> - <constructor> - <parameter>jboss.idm.cfg.xml</parameter> - </constructor> - <property name="idmSessionFactoryJNDI">java:/IdentitySessionFactory</property> - <property name="SQLScript">idm-sql/jboss.idm.hsql.create.sql</property> - <property name="datasource">java:jbossidmDS</property> - <property name="exitSQL">select * from jbid_io</property> - <depends>jboss.jca:service=DataSourceBinding,name=jbossidmDS</depends> - </bean> - -</deployment> \ No newline at end of file Copied: migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml (from rev 1031, migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml) =================================================================== --- migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml (rev 0) +++ migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml 2009-11-19 10:40:13 UTC (rev 1033) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + IDM Service + --> + <bean name="jboss.identity.IDMService" + class="org.picketlink.idm.integration.jboss5.IDMService"> + <constructor> + <parameter>picketlink.idm.cfg.xml</parameter> + </constructor> + <property name="idmSessionFactoryJNDI">java:/IdentitySessionFactory</property> + <property name="SQLScript">idm-sql/picketlink.idm.hsql.create.sql</property> + <property name="datasource">java:idmDS</property> + <property name="exitSQL">select * from jbid_io</property> + <depends>jboss.jca:service=DataSourceBinding,name=jbossidmDS</depends> + </bean> + +</deployment> \ No newline at end of file