[jboss-svn-commits] JBL Code SVN: r36890 - in labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats: internal/arjuna/objectstore/hornetq and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 12 09:32:53 EDT 2011
Author: jhalliday
Date: 2011-04-12 09:32:52 -0400 (Tue, 12 Apr 2011)
New Revision: 36890
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/arjunaI18NLogger.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqJournalStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqObjectStoreAdaptor.java
Log:
log message improvements for HornetQ journal store. JBTM-782
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/arjunaI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/arjunaI18NLogger.java 2011-04-12 11:27:04 UTC (rev 36889)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/arjunaI18NLogger.java 2011-04-12 13:32:52 UTC (rev 36890)
@@ -1436,6 +1436,16 @@
@Message(id = 12364, value = "RecoveryActivator init failed for {0}", format = MESSAGE_FORMAT)
public String get_recovery_RecActivatorLoader_initfailed(String arg0);
+ @Message(id = 12365, value = "Method not implemented", format = MESSAGE_FORMAT)
+ public String get_method_not_implemented();
+
+ @Message(id = 12366, value = "Unexpected data read from journal - file may be corrupt.", format = MESSAGE_FORMAT)
+ @LogMessage(level = WARN)
+ public void warn_journal_load_error();
+
+ @Message(id = 12367, value = "Failed to create store dir {0}", format = MESSAGE_FORMAT)
+ public String get_dir_create_failed(String arg0);
+
/*
Allocate new messages directly above this notice.
- id: use the next id number in numeric sequence. Don't reuse ids.
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqJournalStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqJournalStore.java 2011-04-12 11:27:04 UTC (rev 36889)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqJournalStore.java 2011-04-12 13:32:52 UTC (rev 36890)
@@ -20,6 +20,7 @@
*/
package com.arjuna.ats.internal.arjuna.objectstore.hornetq;
+import com.arjuna.ats.arjuna.logging.tsLogger;
import com.arjuna.ats.arjuna.state.InputObjectState;
import com.arjuna.ats.arjuna.state.OutputObjectState;
import com.arjuna.ats.arjuna.state.OutputBuffer;
@@ -29,7 +30,6 @@
import com.arjuna.ats.internal.arjuna.common.UidHelper;
import org.hornetq.core.journal.*;
-import org.hornetq.core.journal.impl.AIOSequentialFile;
import org.hornetq.core.journal.impl.JournalImpl;
import org.hornetq.core.journal.impl.AIOSequentialFileFactory;
import org.hornetq.core.journal.impl.NIOSequentialFileFactory;
@@ -76,7 +76,7 @@
List<PreparedTransactionInfo> preparedTransactions = new LinkedList<PreparedTransactionInfo>();
TransactionFailureCallback failureCallback = new TransactionFailureCallback() {
public void failedTransaction(long l, java.util.List<org.hornetq.core.journal.RecordInfo> recordInfos, java.util.List<org.hornetq.core.journal.RecordInfo> recordInfos1) {
- System.err.println("This should never get called");
+ tsLogger.i18NLogger.warn_journal_load_error();
}
};
@@ -84,7 +84,7 @@
maxID = journalLoadInformation.getMaxID();
if(!preparedTransactions.isEmpty()) {
- System.err.println("This should never happen");
+ tsLogger.i18NLogger.warn_journal_load_error();
}
for(RecordInfo record : committedRecords) {
@@ -94,20 +94,16 @@
getContentForType(typeName).put(uid, record);
// don't unpack the rest yet, we may never need it. read_committed does it on demand.
}
-
- System.out.println("HornetqJournalStore started foo");
}
public HornetqJournalStore(HornetqJournalEnvironmentBean envBean) throws IOException {
- System.out.println("HornetqJournalStore ctor");
-
syncWrites = envBean.isSyncWrites();
syncDeletes = envBean.isSyncDeletes();
File storeDir = new File(envBean.getStoreDir());
if(!storeDir.exists() && !storeDir.mkdirs()) {
- throw new IOException("Failed to create store dir "+storeDir.getCanonicalPath()); // TODO i18n
+ throw new IOException(tsLogger.i18NLogger.get_dir_create_failed(storeDir.getCanonicalPath()));
}
storeDirCanonicalPath = storeDir.getCanonicalPath();
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqObjectStoreAdaptor.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqObjectStoreAdaptor.java 2011-04-12 11:27:04 UTC (rev 36889)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqObjectStoreAdaptor.java 2011-04-12 13:32:52 UTC (rev 36890)
@@ -22,6 +22,7 @@
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
+import com.arjuna.ats.arjuna.logging.tsLogger;
import com.arjuna.ats.arjuna.objectstore.ObjectStoreAPI;
import com.arjuna.ats.arjuna.objectstore.StateStatus;
import com.arjuna.ats.arjuna.state.InputObjectState;
@@ -56,7 +57,7 @@
</constructor>
</bean>
- TODO wire to RecMgr/TxMgr lifecycle deps
+ plus RecMgr/TxMgr lifecycle deps
*/
@@ -85,6 +86,10 @@
@Override
public void start()
{
+ if(tsLogger.logger.isTraceEnabled()) {
+ tsLogger.logger.trace("HornetqObjectStore.start()");
+ }
+
try {
store.start();
} catch(Exception e) {
@@ -95,6 +100,10 @@
@Override
public void stop()
{
+ if(tsLogger.logger.isTraceEnabled()) {
+ tsLogger.logger.trace("HornetqObjectStore.stop()");
+ }
+
try {
store.stop();
} catch(Exception e) {
@@ -112,7 +121,7 @@
@Override
public InputObjectState read_uncommitted(Uid u, String tn) throws ObjectStoreException
{
- throw new ObjectStoreException("This should never be called");
+ throw new ObjectStoreException(tsLogger.i18NLogger.get_method_not_implemented());
}
/**
@@ -126,7 +135,7 @@
@Override
public boolean remove_uncommitted(Uid u, String tn) throws ObjectStoreException
{
- throw new ObjectStoreException("This should never be called");
+ throw new ObjectStoreException(tsLogger.i18NLogger.get_method_not_implemented());
}
@@ -148,6 +157,10 @@
@Override
public InputObjectState read_committed(Uid u, String typeName) throws ObjectStoreException
{
+ if(tsLogger.logger.isTraceEnabled()) {
+ tsLogger.logger.trace("HornetqObjectStore.read_committed("+u+", "+typeName+")");
+ }
+
typeName = ensureTypenamePrefix(typeName);
return store.read_committed(u, typeName);
@@ -164,6 +177,10 @@
@Override
public boolean remove_committed(Uid u, String typeName) throws ObjectStoreException
{
+ if(tsLogger.logger.isTraceEnabled()) {
+ tsLogger.logger.trace("HornetqObjectStore.remove_committed("+u+", "+typeName+")");
+ }
+
typeName = ensureTypenamePrefix(typeName);
return store.remove_committed(u, typeName);
@@ -181,7 +198,7 @@
@Override
public boolean hide_state(Uid u, String tn) throws ObjectStoreException
{
- throw new ObjectStoreException("This should never be called");
+ throw new ObjectStoreException(tsLogger.i18NLogger.get_method_not_implemented());
}
/**
@@ -195,7 +212,7 @@
@Override
public boolean reveal_state(Uid u, String tn) throws ObjectStoreException
{
- throw new ObjectStoreException("This should never be called");
+ throw new ObjectStoreException(tsLogger.i18NLogger.get_method_not_implemented());
}
/**
@@ -209,7 +226,7 @@
@Override
public boolean commit_state(Uid u, String tn) throws ObjectStoreException
{
- throw new ObjectStoreException("This should never be called");
+ throw new ObjectStoreException(tsLogger.i18NLogger.get_method_not_implemented());
}
/**
@@ -221,6 +238,10 @@
@Override
public int currentState(Uid u, String typeName) throws ObjectStoreException
{
+ if(tsLogger.logger.isTraceEnabled()) {
+ tsLogger.logger.trace("HornetqObjectStore.currentState("+u+", "+typeName+")");
+ }
+
typeName = ensureTypenamePrefix(typeName);
if( store.contains(u, typeName)) {
@@ -243,7 +264,7 @@
@Override
public boolean write_uncommitted(Uid u, String tn, OutputObjectState buff) throws ObjectStoreException
{
- throw new ObjectStoreException("This should never be called");
+ throw new ObjectStoreException(tsLogger.i18NLogger.get_method_not_implemented());
}
/**
@@ -258,6 +279,10 @@
@Override
public boolean write_committed(Uid u, String typeName, OutputObjectState buff) throws ObjectStoreException
{
+ if(tsLogger.logger.isTraceEnabled()) {
+ tsLogger.logger.trace("HornetqObjectStore.write_committed("+u+", "+typeName+")");
+ }
+
typeName = ensureTypenamePrefix(typeName);
return store.write_committed(u, typeName, buff);
@@ -266,6 +291,10 @@
@Override
public boolean allObjUids(String typeName, InputObjectState foundInstances) throws ObjectStoreException
{
+ if(tsLogger.logger.isTraceEnabled()) {
+ tsLogger.logger.trace("HornetqObjectStore.allObjUids("+typeName+")");
+ }
+
typeName = ensureTypenamePrefix(typeName);
return allObjUids(typeName, foundInstances, StateStatus.OS_UNKNOWN);
@@ -283,6 +312,10 @@
@Override
public boolean allObjUids(String typeName, InputObjectState foundInstances, int matchState) throws ObjectStoreException
{
+ if(tsLogger.logger.isTraceEnabled()) {
+ tsLogger.logger.trace("HornetqObjectStore.allObjUids("+typeName+", "+matchState+")");
+ }
+
boolean result = true;
typeName = ensureTypenamePrefix(typeName);
@@ -304,7 +337,7 @@
}
catch (IOException e)
{
- throw new ObjectStoreException("TODO");
+ throw new ObjectStoreException(e);
}
foundInstances.setBuffer(buffer.buffer());
@@ -323,6 +356,10 @@
@Override
public boolean allTypes(InputObjectState foundTypes) throws ObjectStoreException
{
+ if(tsLogger.logger.isTraceEnabled()) {
+ tsLogger.logger.trace("HornetqObjectStore.allTypes()");
+ }
+
boolean result = true;
String[] knownTypes = store.getKnownTypes();
More information about the jboss-svn-commits
mailing list