Author: echatellier Date: 2011-07-01 15:17:48 +0200 (Fri, 01 Jul 2011) New Revision: 1027 Url: http://nuiton.org/repositories/revision/wikitty/1027 Log: Update libs (jbosstja...) Modified: trunk/wikitty-api/src/test/resources/jbossts-properties.xml trunk/wikitty-jdbc/src/test/resources/jbossts-properties.xml trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml trunk/wikitty-solr/src/test/resources/jbossts-properties.xml Modified: trunk/wikitty-api/src/test/resources/jbossts-properties.xml =================================================================== --- trunk/wikitty-api/src/test/resources/jbossts-properties.xml 2011-07-01 11:31:50 UTC (rev 1026) +++ trunk/wikitty-api/src/test/resources/jbossts-properties.xml 2011-07-01 13:17:48 UTC (rev 1027) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <!-- %%Ignore-License @@ -21,8 +22,6 @@ (C) 2009, @author JBoss, a division of Red Hat. --> - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <properties> <!-- This is the JBossTS configuration file for running ArjunaJTA. @@ -52,14 +51,11 @@ the config file. Tokens in system properties won't be substituted. --> - <!-- (default is 0x00000000 i.e. no logging. Set to 0xffffffff for full logging) --> - <entry key="LoggingEnvironmentBean.debugLevel">0x00000000</entry> - <!-- (default is YES) --> <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry> <!-- default is under user.home - must be writeable!) --> - <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbosstm</entry> + <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbossts</entry> <!-- (default is ON) --> <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> @@ -67,9 +63,14 @@ <!-- (Must be unique across all Arjuna instances.) --> <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> - <!-- Which Xid types to recover --> - <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + <!-- Which Xid types to recover --> + <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames"> + com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter + com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter + </entry> + <!-- Base port number for determining a unique number to associate with an instance of the transaction service (which is needed in order to support multiple instances on the same machine). @@ -89,19 +90,19 @@ on recovery modules and their configuration when running in various deployments. --> - <entry key="RecoveryEnvironmentBean.recoveryExtensions"> + <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames"> com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule com.arjuna.ats.internal.txoj.recovery.TORecoveryModule com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule </entry> <!-- Expiry scanners to use (order of invocation is random). --> - <entry key="RecoveryEnvironmentBean.expiryScanners"> + <entry key="RecoveryEnvironmentBean.expiryScannerClassNames"> com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner </entry> <!-- - Add the following to the set of expiryScanners above to move logs that cannot be completed by failure recovery. + Add the following to the set of expiryScannerClassNames above to move logs that cannot be completed by failure recovery. But be sure you know what you are doing and why! com.arjuna.ats.internal.arjuna.recovery.AtomicActionExpiryScanner --> Modified: trunk/wikitty-jdbc/src/test/resources/jbossts-properties.xml =================================================================== --- trunk/wikitty-jdbc/src/test/resources/jbossts-properties.xml 2011-07-01 11:31:50 UTC (rev 1026) +++ trunk/wikitty-jdbc/src/test/resources/jbossts-properties.xml 2011-07-01 13:17:48 UTC (rev 1027) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <!-- %%Ignore-License @@ -20,9 +21,7 @@ (C) 2009, @author JBoss, a division of Red Hat. - --> - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +--> <properties> <!-- This is the JBossTS configuration file for running ArjunaJTA. @@ -52,14 +51,11 @@ the config file. Tokens in system properties won't be substituted. --> - <!-- (default is 0x00000000 i.e. no logging. Set to 0xffffffff for full logging) --> - <entry key="LoggingEnvironmentBean.debugLevel">0x00000000</entry> - <!-- (default is YES) --> <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry> <!-- default is under user.home - must be writeable!) --> - <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbosstm</entry> + <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbossts</entry> <!-- (default is ON) --> <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> @@ -67,9 +63,14 @@ <!-- (Must be unique across all Arjuna instances.) --> <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> - <!-- Which Xid types to recover --> - <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + <!-- Which Xid types to recover --> + <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames"> + com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter + com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter + </entry> + <!-- Base port number for determining a unique number to associate with an instance of the transaction service (which is needed in order to support multiple instances on the same machine). @@ -89,19 +90,19 @@ on recovery modules and their configuration when running in various deployments. --> - <entry key="RecoveryEnvironmentBean.recoveryExtensions"> + <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames"> com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule com.arjuna.ats.internal.txoj.recovery.TORecoveryModule com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule </entry> <!-- Expiry scanners to use (order of invocation is random). --> - <entry key="RecoveryEnvironmentBean.expiryScanners"> + <entry key="RecoveryEnvironmentBean.expiryScannerClassNames"> com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner </entry> <!-- - Add the following to the set of expiryScanners above to move logs that cannot be completed by failure recovery. + Add the following to the set of expiryScannerClassNames above to move logs that cannot be completed by failure recovery. But be sure you know what you are doing and why! com.arjuna.ats.internal.arjuna.recovery.AtomicActionExpiryScanner --> Modified: trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml =================================================================== --- trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml 2011-07-01 11:31:50 UTC (rev 1026) +++ trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml 2011-07-01 13:17:48 UTC (rev 1027) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <!-- %%Ignore-License @@ -20,9 +21,7 @@ (C) 2009, @author JBoss, a division of Red Hat. - --> - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +--> <properties> <!-- This is the JBossTS configuration file for running ArjunaJTA. @@ -52,14 +51,11 @@ the config file. Tokens in system properties won't be substituted. --> - <!-- (default is 0x00000000 i.e. no logging. Set to 0xffffffff for full logging) --> - <entry key="LoggingEnvironmentBean.debugLevel">0x00000000</entry> - <!-- (default is YES) --> <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry> <!-- default is under user.home - must be writeable!) --> - <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbosstm</entry> + <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbossts</entry> <!-- (default is ON) --> <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> @@ -67,9 +63,14 @@ <!-- (Must be unique across all Arjuna instances.) --> <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> - <!-- Which Xid types to recover --> - <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + <!-- Which Xid types to recover --> + <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames"> + com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter + com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter + </entry> + <!-- Base port number for determining a unique number to associate with an instance of the transaction service (which is needed in order to support multiple instances on the same machine). @@ -89,19 +90,19 @@ on recovery modules and their configuration when running in various deployments. --> - <entry key="RecoveryEnvironmentBean.recoveryExtensions"> + <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames"> com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule com.arjuna.ats.internal.txoj.recovery.TORecoveryModule com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule </entry> <!-- Expiry scanners to use (order of invocation is random). --> - <entry key="RecoveryEnvironmentBean.expiryScanners"> + <entry key="RecoveryEnvironmentBean.expiryScannerClassNames"> com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner </entry> <!-- - Add the following to the set of expiryScanners above to move logs that cannot be completed by failure recovery. + Add the following to the set of expiryScannerClassNames above to move logs that cannot be completed by failure recovery. But be sure you know what you are doing and why! com.arjuna.ats.internal.arjuna.recovery.AtomicActionExpiryScanner --> Modified: trunk/wikitty-solr/src/test/resources/jbossts-properties.xml =================================================================== --- trunk/wikitty-solr/src/test/resources/jbossts-properties.xml 2011-07-01 11:31:50 UTC (rev 1026) +++ trunk/wikitty-solr/src/test/resources/jbossts-properties.xml 2011-07-01 13:17:48 UTC (rev 1027) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <!-- %%Ignore-License @@ -20,9 +21,7 @@ (C) 2009, @author JBoss, a division of Red Hat. - --> - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +--> <properties> <!-- This is the JBossTS configuration file for running ArjunaJTA. @@ -52,14 +51,11 @@ the config file. Tokens in system properties won't be substituted. --> - <!-- (default is 0x00000000 i.e. no logging. Set to 0xffffffff for full logging) --> - <entry key="LoggingEnvironmentBean.debugLevel">0x00000000</entry> - <!-- (default is YES) --> <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry> <!-- default is under user.home - must be writeable!) --> - <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbosstm</entry> + <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbossts</entry> <!-- (default is ON) --> <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> @@ -67,9 +63,14 @@ <!-- (Must be unique across all Arjuna instances.) --> <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> - <!-- Which Xid types to recover --> - <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + <!-- Which Xid types to recover --> + <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames"> + com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter + com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter + </entry> + <!-- Base port number for determining a unique number to associate with an instance of the transaction service (which is needed in order to support multiple instances on the same machine). @@ -89,19 +90,19 @@ on recovery modules and their configuration when running in various deployments. --> - <entry key="RecoveryEnvironmentBean.recoveryExtensions"> + <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames"> com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule com.arjuna.ats.internal.txoj.recovery.TORecoveryModule com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule </entry> <!-- Expiry scanners to use (order of invocation is random). --> - <entry key="RecoveryEnvironmentBean.expiryScanners"> + <entry key="RecoveryEnvironmentBean.expiryScannerClassNames"> com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner </entry> <!-- - Add the following to the set of expiryScanners above to move logs that cannot be completed by failure recovery. + Add the following to the set of expiryScannerClassNames above to move logs that cannot be completed by failure recovery. But be sure you know what you are doing and why! com.arjuna.ats.internal.arjuna.recovery.AtomicActionExpiryScanner -->