[jboss-svn-commits] JBL Code SVN: r28644 - in labs/jbosstm/trunk/ArjunaCore: arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 31 06:17:29 EDT 2009
Author: jhalliday
Date: 2009-07-31 06:17:28 -0400 (Fri, 31 Jul 2009)
New Revision: 28644
Added:
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/TxojEnvironmentBean.java
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/arjPropertyManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/byteman-scripts/objectstore.txt
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/LogStoreRecoveryTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/LogStoreTest2.java
Log:
Further beanification of the config. JBTM-596
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/arjPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/arjPropertyManager.java 2009-07-31 09:33:56 UTC (rev 28643)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/arjPropertyManager.java 2009-07-31 10:17:28 UTC (rev 28644)
@@ -97,9 +97,6 @@
synchronized (objectStoreEnvironmentBeanInit) {
if(!objectStoreEnvironmentBeanInit.get()) {
try {
- Thread.dumpStack();
- System.out.println(arjPropertyManager.getPropertyManager().getProperty(Environment.OBJECTSTORE_TYPE));
-
BeanPopulator.configureFromPropertyManager(objectStoreEnvironmentBean, getPropertyManager());
objectStoreEnvironmentBeanInit.set(true);
} catch(Exception e) {
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2009-07-31 09:33:56 UTC (rev 28643)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2009-07-31 10:17:28 UTC (rev 28644)
@@ -1675,6 +1675,8 @@
static
{
+ System.out.println(arjPropertyManager.getObjectStoreEnvironmentBean().getPurgeTime());
+
_synchronousRemoval = arjPropertyManager.getObjectStoreEnvironmentBean().isSynchronousRemoval();
_purgeTime = arjPropertyManager.getObjectStoreEnvironmentBean().getPurgeTime();
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/byteman-scripts/objectstore.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/byteman-scripts/objectstore.txt 2009-07-31 09:33:56 UTC (rev 28643)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/byteman-scripts/objectstore.txt 2009-07-31 10:17:28 UTC (rev 28644)
@@ -20,7 +20,7 @@
AT ENTRY
BIND NOTHING
IF TRUE
-DO System.setProperty(com.arjuna.ats.arjuna.common.Environment.TRANSACTION_LOG_PURGE_TIME, "100")
+DO com.arjuna.ats.arjuna.common.arjPropertyManager.getObjectStoreEnvironmentBean().setPurgeTime(100)
ENDRULE
# rule to ensure that the LogStore does not proceed to purge any
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/LogStoreRecoveryTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/LogStoreRecoveryTest.java 2009-07-31 09:33:56 UTC (rev 28643)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/LogStoreRecoveryTest.java 2009-07-31 10:17:28 UTC (rev 28644)
@@ -51,7 +51,6 @@
{
System.setProperty(Environment.OBJECTSTORE_TYPE, ArjunaNames.Implementation_ObjectStore_ActionLogStore().stringForm());
System.setProperty(Environment.TRANSACTION_LOG, "ON");
- System.setProperty(com.arjuna.ats.arjuna.common.Environment.TRANSACTION_LOG_PURGE_TIME, "100");
super.setUp();
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/LogStoreTest2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/LogStoreTest2.java 2009-07-31 09:33:56 UTC (rev 28643)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/LogStoreTest2.java 2009-07-31 10:17:28 UTC (rev 28644)
@@ -48,7 +48,6 @@
{
System.setProperty(Environment.OBJECTSTORE_TYPE, ArjunaNames.Implementation_ObjectStore_ActionLogStore().stringForm());
System.setProperty(Environment.TRANSACTION_LOG, "ON");
- System.setProperty(com.arjuna.ats.arjuna.common.Environment.TRANSACTION_LOG_PURGE_TIME, "100");
// the byteman script will manage this
//System.setProperty(Environment.TRANSACTION_LOG_PURGE_TIME, "10000");
Added: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/TxojEnvironmentBean.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/TxojEnvironmentBean.java (rev 0)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/TxojEnvironmentBean.java 2009-07-31 10:17:28 UTC (rev 28644)
@@ -0,0 +1,113 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009,
+ * @author JBoss, a division of Red Hat.
+ */
+package com.arjuna.ats.txoj.common;
+
+import com.arjuna.common.internal.util.propertyservice.PropertyPrefix;
+import com.arjuna.common.internal.util.propertyservice.FullPropertyName;
+import com.arjuna.ats.txoj.TxOJNames;
+
+import java.io.File;
+
+/**
+ * TODO javadoc
+ * TODO test case
+ */
+ at PropertyPrefix(prefix = "com.arjuna.ats.txoj.lockstore.")
+public class TxojEnvironmentBean
+{
+ @FullPropertyName(name = "com.arjuna.ats.txoj.common.propertiesFile")
+ private String propertiesFile = "";
+
+ private String lockStoreDir = System.getProperty("user.dir") + File.separator + "LockStore";
+ private String lockStoreType;
+ private String multipleLockStore = null;
+ private String singleLockStore = TxOJNames.Implementation_LockStore_defaultStore().stringForm();
+ private boolean allowNestedLocking = true;
+
+// public static final String PROPERTIES_FILE = "com.arjuna.ats.txoj.common.propertiesFile";
+ public String getPropertiesFile()
+ {
+ return propertiesFile;
+ }
+
+ public void setPropertiesFile(String propertiesFile)
+ {
+ this.propertiesFile = propertiesFile;
+ }
+
+// public static final String LOCKSTORE_DIR = "com.arjuna.ats.txoj.lockstore.lockStoreDir";
+ public String getLockStoreDir()
+ {
+ return lockStoreDir;
+ }
+
+ public void setLockStoreDir(String lockStoreDir)
+ {
+ this.lockStoreDir = lockStoreDir;
+ }
+
+// public static final String LOCKSTORE_TYPE = "com.arjuna.ats.txoj.lockstore.lockStoreType";
+ public String getLockStoreType()
+ {
+ return lockStoreType;
+ }
+
+ public void setLockStoreType(String lockStoreType)
+ {
+ this.lockStoreType = lockStoreType;
+ }
+
+// public static final String MULTIPLE_LOCKSTORE = "com.arjuna.ats.txoj.lockstore.multipleLockStore";
+ public String getMultipleLockStore()
+ {
+ return multipleLockStore;
+ }
+
+ public void setMultipleLockStore(String multipleLockStore)
+ {
+ this.multipleLockStore = multipleLockStore;
+ }
+
+// public static final String SINGLE_LOCKSTORE = "com.arjuna.ats.txoj.lockstore.singleLockStore";
+ public String getSingleLockStore()
+ {
+ return singleLockStore;
+ }
+
+ public void setSingleLockStore(String singleLockStore)
+ {
+ this.singleLockStore = singleLockStore;
+ }
+
+// public static final String ALLOW_NESTED_LOCKING = "com.arjuna.ats.txoj.lockstore.allowNestedLocking";
+ public boolean isAllowNestedLocking()
+ {
+ return allowNestedLocking;
+ }
+
+ public void setAllowNestedLocking(boolean allowNestedLocking)
+ {
+ this.allowNestedLocking = allowNestedLocking;
+ }
+
+
+
+}
More information about the jboss-svn-commits
mailing list