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=&quot;${config.dir}/(a){db}.hibernate.cfg.xml&quot;/&gt; <hbm2ddl drop="false" create="true" export="${export}" console="false" - outputfilename=&quot;jboss.idm.(a){db}.create.sql&quot; delimiter=";" format="true" /> + outputfilename=&quot;picketlink.idm.(a){db}.create.sql&quot; delimiter=";" format="true" /> <hbm2ddl drop="true" create="false" export="${export}" console="false" - outputfilename=&quot;jboss.idm.(a){db}.drop.sql&quot; delimiter=";" format="true" /> + outputfilename=&quot;picketlink.idm.(a){db}.drop.sql&quot; 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&gt;@jdbc.url(a)&lt;/connection-url&gt; <driver-class&gt;@jdbc.driver(a)&lt;/driver-class&gt; <user-name&gt;@jdbc.username(a)&lt;/user-name&gt; 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&gt;@jdbc.url(a)&lt;/connection-url&gt; <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&gt;@jdbc.url(a)&lt;/connection-url&gt; <driver-class>oracle.jdbc.driver.OracleDriver</driver-class> <user-name&gt;@jdbc.username(a)&lt;/user-name&gt; 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&gt;@jdbc.url(a)&lt;/connection-url&gt; <driver-class>org.postgresql.Driver</driver-class> <user-name&gt;@jdbc.username(a)&lt;/user-name&gt; 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&gt;@jdbc.url(a)&lt;/connection-url&gt; <driver-class&gt;@jdbc.driver(a)&lt;/driver-class&gt; <user-name&gt;@jdbc.username(a)&lt;/user-name&gt; 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>