User: d_jencks Date: 02/03/24 13:44:33 Modified: src/etc/conf/default auth.conf jboss-service.xml standardjaws.xml standardjboss.xml standardjbosscmp-jdbc.xml Log: New ConnectionManager implementation Revision Changes Path 1.10 +26 -1 jboss/src/etc/conf/default/auth.conf Index: auth.conf =================================================================== RCS file: /cvsroot/jboss/jboss/src/etc/conf/default/auth.conf,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- auth.conf 6 Mar 2002 17:41:41 -0000 1.9 +++ auth.conf 24 Mar 2002 21:44:32 -0000 1.10 @@ -4,7 +4,7 @@ // // /// ====================================================================== /// -// $Id: auth.conf,v 1.9 2002/03/06 17:41:41 pra Exp $ +// $Id: auth.conf,v 1.10 2002/03/24 21:44:32 d_jencks Exp $ // Put login modules providing authentication and realm mappings // for security domains. @@ -46,5 +46,30 @@ org.jboss.mq.sm.file.DynamicLoginModule required unauthenticatedIdentity="guest" sm.objectname="jboss.mq:service=StateManager" + ; +}; + +// Security domain for testing new jca framework +DefaultDbRealm { + // + // Security domain for new jca framework. + // One per ManagedConnectionFactory are required. + org.jboss.resource.security.ConfiguredIdentityLoginModule required + principal="sa" + userName="sa" + password="" + managedConnectionFactoryName="jboss.jca:service=LocalTxCM" + ; +}; + +JmsXARealm { + // + // Security domain for new jca framework. + // One per ManagedConnectionFactory are required. + org.jboss.resource.security.ConfiguredIdentityLoginModule required + principal="guest" + userName="guest" + password="guest" + managedConnectionFactoryName="jboss.jca:service=JmsXACM" ; }; 1.39 +7 -1 jboss/src/etc/conf/default/jboss-service.xml Index: jboss-service.xml =================================================================== RCS file: /cvsroot/jboss/jboss/src/etc/conf/default/jboss-service.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- jboss-service.xml 23 Mar 2002 03:06:01 -0000 1.38 +++ jboss-service.xml 24 Mar 2002 21:44:32 -0000 1.39 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE server> -<!-- $Id: jboss-service.xml,v 1.38 2002/03/23 03:06:01 starksm Exp $ --> +<!-- $Id: jboss-service.xml,v 1.39 2002/03/24 21:44:32 d_jencks Exp $ --> <!-- ===================================================================== --> <!-- --> @@ -119,6 +119,12 @@ <mbean code="org.jboss.tm.usertx.server.ClientUserTransactionService" name="jboss:service=ClientUserTransaction"> </mbean> + + <!-- The CachedConnectionManager is used partly to relay started UserTransactions to + open connections so they may be enrolled in the new tx--> + <mbean code="org.jboss.resource.connectionmanager.CachedConnectionManager" name="jboss.jca:service=CachedConnectionManager"> + </mbean> + <!-- ==================================================================== --> <!-- RMI/IIOP --> 1.27 +3 -3 jboss/src/etc/conf/default/standardjaws.xml Index: standardjaws.xml =================================================================== RCS file: /cvsroot/jboss/jboss/src/etc/conf/default/standardjaws.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- standardjaws.xml 5 Dec 2001 05:02:48 -0000 1.26 +++ standardjaws.xml 24 Mar 2002 21:44:32 -0000 1.27 @@ -10,11 +10,11 @@ <!-- --> <!-- ===================================================================== --> -<!-- $Id: standardjaws.xml,v 1.26 2001/12/05 05:02:48 patriot1burke Exp $ --> +<!-- $Id: standardjaws.xml,v 1.27 2002/03/24 21:44:32 d_jencks Exp $ --> <jaws> <datasource>java:/DefaultDS</datasource> - <type-mapping>Hypersonic SQL</type-mapping> + <type-mapping>@default.type.mapping@</type-mapping> <debug>false</debug> <default-entity> @@ -73,7 +73,7 @@ <mapping> <java-type>java.lang.String</java-type> <jdbc-type>VARCHAR</jdbc-type> - <sql-type>VARCHAR(255)</sql-type> + <sql-type>VARCHAR(64)</sql-type> </mapping> <mapping> <java-type>java.sql.Date</java-type> 1.36 +20 -5 jboss/src/etc/conf/default/standardjboss.xml Index: standardjboss.xml =================================================================== RCS file: /cvsroot/jboss/jboss/src/etc/conf/default/standardjboss.xml,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- standardjboss.xml 11 Mar 2002 01:31:40 -0000 1.35 +++ standardjboss.xml 24 Mar 2002 21:44:32 -0000 1.36 @@ -7,7 +7,7 @@ <!-- --> <!-- ===================================================================== --> -<!-- $Id: standardjboss.xml,v 1.35 2002/03/11 01:31:40 reverbel Exp $ --> +<!-- $Id: standardjboss.xml,v 1.36 2002/03/24 21:44:32 d_jencks Exp $ --> <jboss> <enforce-ejb-restrictions>false</enforce-ejb-restrictions> @@ -24,6 +24,7 @@ <interceptor metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor> + @jca.connection.interceptor@ <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor> </container-interceptors> @@ -91,6 +92,7 @@ <interceptor metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor> + @jca.connection.interceptor@ <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor> </container-interceptors> <client-interceptors> @@ -115,7 +117,7 @@ </client-interceptors> <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool> <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache> - <persistence-manager>org.jboss.ejb.plugins.jaws.JAWSPersistenceManager</persistence-manager> + <persistence-manager>@cmp1.persistencemanager@</persistence-manager> <transaction-manager>org.jboss.tm.TxManager</transaction-manager> <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy> <container-invoker-conf> @@ -157,6 +159,7 @@ <interceptor metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor> + @jca.connection.interceptor@ <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor> </container-interceptors> @@ -224,6 +227,7 @@ <interceptor metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor> + @jca.connection.interceptor@ <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor> </container-interceptors> <client-interceptors> @@ -248,7 +252,7 @@ </client-interceptors> <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool> <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache> - <persistence-manager>org.jboss.ejb.plugins.jaws.JAWSPersistenceManager</persistence-manager> + <persistence-manager>@cmp1.persistencemanager@</persistence-manager> <transaction-manager>org.jboss.tm.TxManager</transaction-manager> <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy> <container-invoker-conf> @@ -290,6 +294,7 @@ <interceptor metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor> + @jca.connection.interceptor@ <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor> </container-interceptors> <client-interceptors> @@ -314,7 +319,7 @@ </client-interceptors> <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool> <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache> - <persistence-manager>org.jboss.ejb.plugins.jaws.JAWSPersistenceManager</persistence-manager> + <persistence-manager>@cmp1.persistencemanager@</persistence-manager> <transaction-manager>org.jboss.tm.TxManager</transaction-manager> <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy> <container-invoker-conf> @@ -360,6 +365,7 @@ <interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor> <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor> <interceptor transaction="Bean" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> + @jca.connection.interceptor@ </container-interceptors> <client-interceptors> <home> @@ -408,6 +414,7 @@ <interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor> <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor> <interceptor transaction="Bean" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> + @jca.connection.interceptor@ </container-interceptors> <client-interceptors> <home> @@ -456,6 +463,7 @@ <interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor> <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor> <interceptor transaction="Bean" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> + @jca.connection.interceptor@ </container-interceptors> <client-interceptors> <home> @@ -503,6 +511,7 @@ <interceptor transaction="Bean">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor> <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor> <interceptor transaction="Bean" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> + @jca.connection.interceptor@ <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor> </container-interceptors> <client-interceptors> @@ -566,6 +575,7 @@ <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor> <interceptor transaction="Bean" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor> + @jca.connection.interceptor@ </container-interceptors> <client-interceptors> <home> @@ -628,6 +638,7 @@ <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor> <interceptor transaction="Bean" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor> + @jca.connection.interceptor@ <interceptor>org.jboss.ejb.plugins.StatefulHASessionSynchronisationInterceptor</interceptor> </container-interceptors> <client-interceptors> @@ -687,6 +698,7 @@ <interceptor metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor> + @jca.connection.interceptor@ <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor> </container-interceptors> <client-interceptors> @@ -753,6 +765,7 @@ <interceptor metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor> + @jca.connection.interceptor@ <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor> </container-interceptors> <client-interceptors> @@ -819,6 +832,7 @@ <interceptor metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor> <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor> + @jca.connection.interceptor@ <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor> </container-interceptors> <client-interceptors> @@ -889,6 +903,7 @@ <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor> <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor> <interceptor transaction="Bean" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor> + @jca.connection.interceptor@ </container-interceptors> <client-interceptors> <home> @@ -995,7 +1010,7 @@ </container-interceptors> <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool> <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache> - <persistence-manager>org.jboss.ejb.plugins.jaws.JAWSPersistenceManager</persistence-manager> + <persistence-manager>@cmp1.persistencemanager@</persistence-manager> <transaction-manager>org.jboss.tm.TxManager</transaction-manager> <web-class-loader>org.jboss.iiop.WebCL</web-class-loader> <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy> 1.20 +3 -3 jboss/src/etc/conf/default/standardjbosscmp-jdbc.xml Index: standardjbosscmp-jdbc.xml =================================================================== RCS file: /cvsroot/jboss/jboss/src/etc/conf/default/standardjbosscmp-jdbc.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- standardjbosscmp-jdbc.xml 27 Feb 2002 06:46:48 -0000 1.19 +++ standardjbosscmp-jdbc.xml 24 Mar 2002 21:44:33 -0000 1.20 @@ -7,13 +7,13 @@ <!-- --> <!-- ===================================================================== --> -<!-- $Id: standardjbosscmp-jdbc.xml,v 1.19 2002/02/27 06:46:48 dsundstrom Exp $ --> +<!-- $Id: standardjbosscmp-jdbc.xml,v 1.20 2002/03/24 21:44:33 d_jencks Exp $ --> <jbosscmp-jdbc> <defaults> <datasource>java:/DefaultDS</datasource> - <datasource-mapping>Hypersonic SQL</datasource-mapping> + <datasource-mapping>@default.type.mapping@</datasource-mapping> <create-table>true</create-table> <remove-table>false</remove-table> @@ -84,7 +84,7 @@ <mapping> <java-type>java.lang.String</java-type> <jdbc-type>VARCHAR</jdbc-type> - <sql-type>VARCHAR(255)</sql-type> + <sql-type>VARCHAR(64)</sql-type> </mapping> <mapping> <java-type>java.sql.Date</java-type>
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development