Author: jeff.yuchang Date: 2009-06-23 02:48:49 -0400 (Tue, 23 Jun 2009) New Revision: 623 Modified: idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mysql-ds.xml idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-oracle-ds.xml idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-postgresql-ds.xml idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-sybase-ds.xml idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml Log: * Using the local-tx-datasource as default in the distribution. Modified: idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mysql-ds.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mysql-ds.xml 2009-06-22 10:25:56 UTC (rev 622) +++ idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-mysql-ds.xml 2009-06-23 06:48:49 UTC (rev 623) @@ -1,34 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <datasources> - - <xa-datasource> - <jndi-name>jbossidmDS</jndi-name> - - <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class> - <xa-datasource-property name=&quot;URL&quot;&gt;@jdbc.url(a)&lt;/xa-datasource-property&gt; - <user-name&gt;@jdbc.username(a)&lt;/user-name&gt; - <password&gt;@jdbc.password(a)&lt;/password&gt; - - - <!-- reduce isolation from the default level (repeatable read) --> - <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> - <!-- separate connections used with and without JTA transaction --> - <no-tx-separate-pools /> - <!-- disable transaction interleaving --> - <track-connection-by-tx /> - - <!-- leverage mysql integration features --> - <exception-sorter-class-name> - com.mysql.jdbc.integration.jboss.ExtendedMysqlExceptionSorter - </exception-sorter-class-name> - <valid-connection-checker-class-name> - com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker - </valid-connection-checker-class-name> - - <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml --> - <metadata> - <type-mapping>mySQL</type-mapping> - </metadata> - </xa-datasource> - + <local-tx-datasource> + <jndi-name>jbossidmDS</jndi-name> + + <connection-url&gt;@jdbc.url(a)&lt;/connection-url&gt; + <driver-class>com.mysql.jdbc.Driver</driver-class> + + <user-name&gt;@jdbc.username(a)&lt;/user-name&gt; + <password&gt;@jdbc.password(a)&lt;/password&gt; + + <!-- Typemapping for JBoss 4.0 --> + <metadata> + <type-mapping>mySQL</type-mapping> + </metadata> + + </local-tx-datasource> </datasources> \ No newline at end of file Modified: idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-oracle-ds.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-oracle-ds.xml 2009-06-22 10:25:56 UTC (rev 622) +++ idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-oracle-ds.xml 2009-06-23 06:48:49 UTC (rev 623) @@ -1,39 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- ===================================================================== --> -<!-- --> -<!-- JBoss Server Configuration --> -<!-- --> -<!-- ===================================================================== --> - -<!-- $Id: jbpm-oracle-ds.xml 4458 2009-04-06 14:36:41Z heiko.braun(a)jboss.com $ --> - -<!-- ===================================================================== --> -<!-- ATTENTION: DO NOT FORGET TO SET Pad=true IN transaction-service.xml --> -<!-- ===================================================================== --> - -<datasources> - <xa-datasource> +<datasources> + <local-tx-datasource> <jndi-name>jbossidmDS</jndi-name> - <track-connection-by-tx/> - <!-- uncomment to enable interleaving <interleaving/> --> - <isSameRM-override-value>false</isSameRM-override-value> - <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> - <xa-datasource-property name=&quot;URL&quot;&gt;@jdbc.url(a)&lt;/xa-datasource-property&gt; - <xa-datasource-property name=&quot;User&quot;&gt;@jdbc.username(a)&lt;/xa-datasource-property&gt; - <xa-datasource-property name=&quot;Password&quot;&gt;@jdbc.password(a)&lt;/xa-datasource-property&gt; + <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; + <password&gt;@jdbc.password(a)&lt;/password&gt; + + <min-pool-size>5</min-pool-size> + <max-pool-size>100</max-pool-size> - <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool --> - <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name--> - <!-- Checks the Oracle error codes and messages for fatal errors --> - <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name> - <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa --> - <no-tx-separate-pools/> - <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) --> <metadata> <type-mapping>Oracle9i</type-mapping> </metadata> - </xa-datasource> - + </local-tx-datasource> </datasources> Modified: idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-postgresql-ds.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-postgresql-ds.xml 2009-06-22 10:25:56 UTC (rev 622) +++ idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-postgresql-ds.xml 2009-06-23 06:48:49 UTC (rev 623) @@ -1,24 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<datasources> - <xa-datasource> +<datasources> + <local-tx-datasource> <jndi-name>jbossidmDS</jndi-name> - - <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class> - <xa-datasource-property name=&quot;PortNumber&quot;&gt;@jdbc.port(a)&lt;/xa-datasource-property&gt; - <xa-datasource-property name=&quot;DatabaseName&quot;&gt;@jdbc.databasename(a)&lt;/xa-datasource-property&gt; - <xa-datasource-property name=&quot;ServerName&quot;&gt;@jdbc.server(a)&lt;/xa-datasource-property&gt; + <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; <password&gt;@jdbc.password(a)&lt;/password&gt; - - <!-- disable transaction interleaving --> - <track-connection-by-tx /> - - <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml --> - <metadata> - <type-mapping>PostgreSQL 8.0</type-mapping> - </metadata> - </xa-datasource> - + <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) --> + <metadata> + <type-mapping>PostgreSQL 8.0</type-mapping> + </metadata> + </local-tx-datasource> </datasources> Modified: idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-sybase-ds.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-sybase-ds.xml 2009-06-22 10:25:56 UTC (rev 622) +++ idm/trunk/assembly/src/main/files/jboss/datasources/jbidm-sybase-ds.xml 2009-06-23 06:48:49 UTC (rev 623) @@ -14,6 +14,5 @@ <type-mapping>Sybase</type-mapping> </metadata> </local-tx-datasource> - </datasources> Modified: idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml =================================================================== --- idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml 2009-06-22 10:25:56 UTC (rev 622) +++ idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml 2009-06-23 06:48:49 UTC (rev 623) @@ -18,16 +18,6 @@ <external-config/> <default-identity-store-id>Identity_DB_Store</default-identity-store-id> <default-attribute-store-id>Identity_DB_Store</default-attribute-store-id> - <options> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - <option> - <name>allowNotDefinedIdentityObjectTypes</name> - <value>true</value> - </option> - </options> </repository> </repositories> <stores> @@ -39,7 +29,7 @@ <external-config/> <supported-relationship-types> <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> </supported-relationship-types> <supported-identity-object-types> <identity-object-type> @@ -96,26 +86,6 @@ <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> @@ -131,9 +101,17 @@ <value>true</value> </option> <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </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>