[Mulgara-svn] r681 - in branches/mgr-73: jxdata/iTQL jxdata/iTQL/parser src/jar/client-jrdf/java/org/mulgara/client/jrdf/test src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing src/jar/descriptor/src/java/org/mulgara/descriptor src/jar/itql/java/org/mulgara/itql src/jar/itql/sablecc src/jar/query/java/org/mulgara/query src/jar/query/java/org/mulgara/query/rdf src/jar/rdql/java/org/mulgara/rdql src/jar/resolver-lucene/java/org/mulgara/resolver/lucene src/jar/resolver-store/java/org/mulgara/resolver/store src/jar/resolver-store/java/org/mulgara/store/statement/xa src/jar/resolver-test/java/org/mulgara/resolver/test src/jar/server/java/org/mulgara/server src/jar/server-beep/java/org/mulgara/server/beep src/jar/server-http/java/org/mulgara/server/http src/jar/server-rmi/java/org/mulgara/server/rmi src/jar/sparql-protocol/java/org/mulgara/sparql/protocol src/jar/store-nodepool-xa/java/org/mulgara/store/nodepool/xa src/jar/store-stringpool/java/org/mulgara/store/stringpool src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa src/jar/store-xa/java/org/mulgara/store/xa src/jar/tuples/java/org/mulgara/store/tuples src/jar/tuples-hybrid/java/org/mulgara/store/xa src/jar/util/java/org/mulgara/util src/jar/util-xa/java/org/mulgara/store/xa src/war/server-http/java
andrae at mulgara.org
andrae at mulgara.org
Mon Mar 17 08:19:03 UTC 2008
Author: andrae
Date: 2008-03-17 01:19:01 -0700 (Mon, 17 Mar 2008)
New Revision: 681
Added:
branches/mgr-73/jxdata/iTQL/parser/
branches/mgr-73/jxdata/iTQL/parser/createResult.txt
branches/mgr-73/jxdata/iTQL/parser/dropResult.txt
branches/mgr-73/jxdata/iTQL/parser/insertResult1.txt
branches/mgr-73/jxdata/iTQL/parser/insertResult2.txt
branches/mgr-73/jxdata/iTQL/parser/insertResult3.txt
branches/mgr-73/jxdata/iTQL/parser/test.jxu
Removed:
branches/mgr-73/jxdata/iTQL/parser/createResult.txt
branches/mgr-73/jxdata/iTQL/parser/dropResult.txt
branches/mgr-73/jxdata/iTQL/parser/insertResult1.txt
branches/mgr-73/jxdata/iTQL/parser/insertResult2.txt
branches/mgr-73/jxdata/iTQL/parser/insertResult3.txt
branches/mgr-73/jxdata/iTQL/parser/test.jxu
Modified:
branches/mgr-73/src/jar/client-jrdf/java/org/mulgara/client/jrdf/test/ClientGraphUnitTest.java
branches/mgr-73/src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing/Mp3Application.java
branches/mgr-73/src/jar/descriptor/src/java/org/mulgara/descriptor/PIErrorHandler.java
branches/mgr-73/src/jar/itql/java/org/mulgara/itql/CollaboratorUnitTest.java
branches/mgr-73/src/jar/itql/java/org/mulgara/itql/HelpPrinter.java
branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java
branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlOptionParser.java
branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlSession.java
branches/mgr-73/src/jar/itql/java/org/mulgara/itql/TqlSession.java
branches/mgr-73/src/jar/itql/sablecc/itql.grammar
branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerImpl.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerOperations.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerOperationsUnitTest.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerUnitTest.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintHaving.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintImpl.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintIs.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintNotOccurs.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOccurs.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOccursLessThan.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOccursMoreThan.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOperation.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/ModelLiteral.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/ModelPartition.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/ModelResourceUnitTest.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/QueryUnitTest.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/SingleTransitiveConstraint.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/TransitiveConstraint.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/UnconstrainedAnswer.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/WalkConstraint.java
branches/mgr-73/src/jar/query/java/org/mulgara/query/rdf/LiteralImplUnitTest.java
branches/mgr-73/src/jar/rdql/java/org/mulgara/rdql/RdqlOptionParser.java
branches/mgr-73/src/jar/rdql/java/org/mulgara/rdql/RdqlSession.java
branches/mgr-73/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java
branches/mgr-73/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreDuplicateResolution.java
branches/mgr-73/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreInverseResolution.java
branches/mgr-73/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolution.java
branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java
branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFileUnitTest.java
branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleWriteThread.java
branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/XAStatementStoreImpl.java
branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/XAStatementStoreImplUnitTest.java
branches/mgr-73/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverUnitTest.java
branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/BEEPAnswer.java
branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/BEEPSession.java
branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/CommandProfile.java
branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/CommandRequestHandler.java
branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/QueryProfile.java
branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/QueryRequestHandler.java
branches/mgr-73/src/jar/server-http/java/org/mulgara/server/http/HttpSessionFactory.java
branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerPageImplUnitTest.java
branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerWrapperRemoteAnswerSerialised.java
branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/PagedRemoteAnswer.java
branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteAnswer.java
branches/mgr-73/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraOptionParser.java
branches/mgr-73/src/jar/sparql-protocol/java/org/mulgara/sparql/protocol/StreamAnswerTest.java
branches/mgr-73/src/jar/store-nodepool-xa/java/org/mulgara/store/nodepool/xa/XANodePoolImpl.java
branches/mgr-73/src/jar/store-nodepool-xa/java/org/mulgara/store/nodepool/xa/XANodePoolImplTest.java
branches/mgr-73/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java
branches/mgr-73/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImplTest.java
branches/mgr-73/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImpl.java
branches/mgr-73/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImplTest.java
branches/mgr-73/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolLoadTest.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPObject.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPStringComparator.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPTypedLiteral.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/StringPoolAbstractTest.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBinaryComparator.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPCaseInsensitiveStringComparator.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPCaseSensitiveStringComparator.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPObjectFactoryImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPStringImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPTypedLiteralRegistry.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPURIImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralImpl.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringFactory.java
branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringImpl.java
branches/mgr-73/src/jar/store-xa/java/org/mulgara/store/xa/SimpleXAResourceException.java
branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/BlockCacheLine.java
branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/CacheLine.java
branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuples.java
branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuplesTest.java
branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/MemoryCacheLine.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/ConstrainedNegationTuples.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DefaultRowComparator.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DenseLongMatrix.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DifferenceUnitTest.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DistinctTuples.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DistinctTuplesUnitTest.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/HavingPredicates.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/JoinTuples.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/LimitedTuples.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/LiteralTuplesUnitTest.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/OffsetTuples.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/OrderedProjection.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/OrderedProjectionUnitTest.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicate.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicateFactory.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicatePrototype.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictionTuples.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/TestTuplesUnitTest.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnboundJoinUnitTest.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnconstrainedTuplesUnitTest.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedAppend.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedAppendUnitTest.java
branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedProjection.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AVLFile.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AVLFileTest.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AVLNode.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AbstractBlockFile.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/Block.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/BlockFile.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/BlockFileTest.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/FreeList.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/FreeListTest.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/IOBlockFile.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/IOBlockFileTest.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/LockFile.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/ManagedBlockFile.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/ManagedBlockFileTest.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFile.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFileTest.java
branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/ObjectPool.java
branches/mgr-73/src/jar/util/java/org/mulgara/util/IntFile.java
branches/mgr-73/src/jar/util/java/org/mulgara/util/LongToStringMap.java
branches/mgr-73/src/jar/util/java/org/mulgara/util/MappedIntFile.java
branches/mgr-73/src/jar/util/java/org/mulgara/util/ResultSetMetaDataImpl.java
branches/mgr-73/src/jar/util/java/org/mulgara/util/StringToLongMap.java
branches/mgr-73/src/jar/util/java/org/mulgara/util/TempDir.java
branches/mgr-73/src/jar/util/java/org/mulgara/util/TestResultSet.java
branches/mgr-73/src/jar/util/java/org/mulgara/util/TestResultSetTest.java
branches/mgr-73/src/war/server-http/java/HttpServer.java
Log:
refs #73
refs #85
svn merge -r 675:677 ../../trunk/ .
This brings the mgr-73 branch in sync with trunk.
Copied: branches/mgr-73/jxdata/iTQL/parser (from rev 677, trunk/jxdata/iTQL/parser)
Deleted: branches/mgr-73/jxdata/iTQL/parser/createResult.txt
===================================================================
--- trunk/jxdata/iTQL/parser/createResult.txt 2008-03-12 07:17:57 UTC (rev 677)
+++ branches/mgr-73/jxdata/iTQL/parser/createResult.txt 2008-03-17 08:19:01 UTC (rev 681)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#parsertest</message></query></answer>
Copied: branches/mgr-73/jxdata/iTQL/parser/createResult.txt (from rev 677, trunk/jxdata/iTQL/parser/createResult.txt)
===================================================================
--- branches/mgr-73/jxdata/iTQL/parser/createResult.txt (rev 0)
+++ branches/mgr-73/jxdata/iTQL/parser/createResult.txt 2008-03-17 08:19:01 UTC (rev 681)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#parsertest</message></query></answer>
Deleted: branches/mgr-73/jxdata/iTQL/parser/dropResult.txt
===================================================================
--- trunk/jxdata/iTQL/parser/dropResult.txt 2008-03-12 07:17:57 UTC (rev 677)
+++ branches/mgr-73/jxdata/iTQL/parser/dropResult.txt 2008-03-17 08:19:01 UTC (rev 681)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped graph @server@#parsertest</message></query></answer>
Copied: branches/mgr-73/jxdata/iTQL/parser/dropResult.txt (from rev 677, trunk/jxdata/iTQL/parser/dropResult.txt)
===================================================================
--- branches/mgr-73/jxdata/iTQL/parser/dropResult.txt (rev 0)
+++ branches/mgr-73/jxdata/iTQL/parser/dropResult.txt 2008-03-17 08:19:01 UTC (rev 681)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped graph @server@#parsertest</message></query></answer>
Deleted: branches/mgr-73/jxdata/iTQL/parser/insertResult1.txt
===================================================================
--- trunk/jxdata/iTQL/parser/insertResult1.txt 2008-03-12 07:17:57 UTC (rev 677)
+++ branches/mgr-73/jxdata/iTQL/parser/insertResult1.txt 2008-03-17 08:19:01 UTC (rev 681)
@@ -1,2 +0,0 @@
-ItqlInterpreter error - [1,9] Unknown token: >
-Caused by: (LexerException) [1,9] Unknown token: >
Copied: branches/mgr-73/jxdata/iTQL/parser/insertResult1.txt (from rev 677, trunk/jxdata/iTQL/parser/insertResult1.txt)
===================================================================
--- branches/mgr-73/jxdata/iTQL/parser/insertResult1.txt (rev 0)
+++ branches/mgr-73/jxdata/iTQL/parser/insertResult1.txt 2008-03-17 08:19:01 UTC (rev 681)
@@ -0,0 +1,2 @@
+ItqlInterpreter error - [1,9] Unknown token: >
+Caused by: (LexerException) [1,9] Unknown token: >
Deleted: branches/mgr-73/jxdata/iTQL/parser/insertResult2.txt
===================================================================
--- trunk/jxdata/iTQL/parser/insertResult2.txt 2008-03-12 07:17:57 UTC (rev 677)
+++ branches/mgr-73/jxdata/iTQL/parser/insertResult2.txt 2008-03-17 08:19:01 UTC (rev 681)
@@ -1,2 +0,0 @@
-ItqlInterpreter error - [1,19] Unknown token: >
-Caused by: (LexerException) [1,19] Unknown token: >
Copied: branches/mgr-73/jxdata/iTQL/parser/insertResult2.txt (from rev 677, trunk/jxdata/iTQL/parser/insertResult2.txt)
===================================================================
--- branches/mgr-73/jxdata/iTQL/parser/insertResult2.txt (rev 0)
+++ branches/mgr-73/jxdata/iTQL/parser/insertResult2.txt 2008-03-17 08:19:01 UTC (rev 681)
@@ -0,0 +1,2 @@
+ItqlInterpreter error - [1,19] Unknown token: >
+Caused by: (LexerException) [1,19] Unknown token: >
Deleted: branches/mgr-73/jxdata/iTQL/parser/insertResult3.txt
===================================================================
--- trunk/jxdata/iTQL/parser/insertResult3.txt 2008-03-12 07:17:57 UTC (rev 677)
+++ branches/mgr-73/jxdata/iTQL/parser/insertResult3.txt 2008-03-17 08:19:01 UTC (rev 681)
@@ -1,2 +0,0 @@
-ItqlInterpreter error - [1,28] Unknown token: >
-Caused by: (LexerException) [1,28] Unknown token: >
Copied: branches/mgr-73/jxdata/iTQL/parser/insertResult3.txt (from rev 677, trunk/jxdata/iTQL/parser/insertResult3.txt)
===================================================================
--- branches/mgr-73/jxdata/iTQL/parser/insertResult3.txt (rev 0)
+++ branches/mgr-73/jxdata/iTQL/parser/insertResult3.txt 2008-03-17 08:19:01 UTC (rev 681)
@@ -0,0 +1,2 @@
+ItqlInterpreter error - [1,28] Unknown token: >
+Caused by: (LexerException) [1,28] Unknown token: >
Deleted: branches/mgr-73/jxdata/iTQL/parser/test.jxu
===================================================================
--- trunk/jxdata/iTQL/parser/test.jxu 2008-03-12 07:17:57 UTC (rev 677)
+++ branches/mgr-73/jxdata/iTQL/parser/test.jxu 2008-03-17 08:19:01 UTC (rev 681)
@@ -1,53 +0,0 @@
-<jxu>
- <set name="debug" value="false" />
-
- <set name="query" value="create <@server@#parsertest> ;"/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="createResult.txt" name="queryResult">
- <save name="queryResult" file="badCreateResult.xml"/>
- <fail>Output failed. Check badCreateResult.xml for output.</fail>
- </ifEqual>
-
- <set name="query" value="
- insert <> <foo:bar> <foo:a1>
- <> <foo:baz> <foo:a2>
- <> <foo:boz> <foo:a3>
- into <@server@#parsertest> ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="insertResult1.txt" name="queryResult">
- <save name="queryResult" file="badInsert1Result.xml"/>
- <fail>Output failed. Check badInsert1Result.xml for output.</fail>
- </ifEqual>
-
- <set name="query" value="
- insert <foo:bar> <> <foo:a1>
- <foo:baz> <> <foo:a2>
- <foo:boz> <> <foo:a3>
- into <@server@#parsertest> ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="insertResult2.txt" name="queryResult">
- <save name="queryResult" file="badInsert2Result.xml"/>
- <fail>Output failed. Check badInsert2Result.xml for output.</fail>
- </ifEqual>
-
- <set name="query" value="
- insert <foo:bar> <foo:a1> <>
- <foo:baz> <foo:a2> <>
- <foo:boz> <foo:a3> <>
- into <@server@#parsertest> ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="insertResult3.txt" name="queryResult">
- <save name="queryResult" file="badInsert3Result.xml"/>
- <fail>Output failed. Check badInsert3Result.xml for output.</fail>
- </ifEqual>
-
- <set name="query" value="drop <@server@#parsertest> ;"/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="dropResult.txt" name="queryResult">
- <save name="queryResult" file="badDropResult.xml"/>
- <fail>Output failed. Check badDropResult.xml for output.</fail>
- </ifEqual>
-</jxu>
Copied: branches/mgr-73/jxdata/iTQL/parser/test.jxu (from rev 677, trunk/jxdata/iTQL/parser/test.jxu)
===================================================================
--- branches/mgr-73/jxdata/iTQL/parser/test.jxu (rev 0)
+++ branches/mgr-73/jxdata/iTQL/parser/test.jxu 2008-03-17 08:19:01 UTC (rev 681)
@@ -0,0 +1,53 @@
+<jxu>
+ <set name="debug" value="false" />
+
+ <set name="query" value="create <@server@#parsertest> ;"/>
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="createResult.txt" name="queryResult">
+ <save name="queryResult" file="badCreateResult.xml"/>
+ <fail>Output failed. Check badCreateResult.xml for output.</fail>
+ </ifEqual>
+
+ <set name="query" value="
+ insert <> <foo:bar> <foo:a1>
+ <> <foo:baz> <foo:a2>
+ <> <foo:boz> <foo:a3>
+ into <@server@#parsertest> ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="insertResult1.txt" name="queryResult">
+ <save name="queryResult" file="badInsert1Result.xml"/>
+ <fail>Output failed. Check badInsert1Result.xml for output.</fail>
+ </ifEqual>
+
+ <set name="query" value="
+ insert <foo:bar> <> <foo:a1>
+ <foo:baz> <> <foo:a2>
+ <foo:boz> <> <foo:a3>
+ into <@server@#parsertest> ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="insertResult2.txt" name="queryResult">
+ <save name="queryResult" file="badInsert2Result.xml"/>
+ <fail>Output failed. Check badInsert2Result.xml for output.</fail>
+ </ifEqual>
+
+ <set name="query" value="
+ insert <foo:bar> <foo:a1> <>
+ <foo:baz> <foo:a2> <>
+ <foo:boz> <foo:a3> <>
+ into <@server@#parsertest> ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="insertResult3.txt" name="queryResult">
+ <save name="queryResult" file="badInsert3Result.xml"/>
+ <fail>Output failed. Check badInsert3Result.xml for output.</fail>
+ </ifEqual>
+
+ <set name="query" value="drop <@server@#parsertest> ;"/>
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="dropResult.txt" name="queryResult">
+ <save name="queryResult" file="badDropResult.xml"/>
+ <fail>Output failed. Check badDropResult.xml for output.</fail>
+ </ifEqual>
+</jxu>
Modified: branches/mgr-73/src/jar/client-jrdf/java/org/mulgara/client/jrdf/test/ClientGraphUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/client-jrdf/java/org/mulgara/client/jrdf/test/ClientGraphUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/client-jrdf/java/org/mulgara/client/jrdf/test/ClientGraphUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -36,7 +36,7 @@
import junit.framework.*;
//Log4J
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// JRDF
import org.jrdf.graph.*;
@@ -75,8 +75,7 @@
/**
* the category to send logging info to
*/
- private static Category log =
- Category.getInstance(ClientGraphUnitTest.class.getName());
+ private static Logger log = Logger.getLogger(ClientGraphUnitTest.class);
/**
* Server to query against.
Modified: branches/mgr-73/src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing/Mp3Application.java
===================================================================
--- branches/mgr-73/src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing/Mp3Application.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing/Mp3Application.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -499,7 +499,7 @@
try {
// Just use the basic Log configurator
BasicConfigurator.configure();
- Category.getRoot().setLevel(Level.WARN);
+ Logger.getRootLogger().setLevel(Level.WARN);
// create an Application
String config = Mp3Application.DEFAULT_CONFIG_FILE;
if (args.length > 0) {
Modified: branches/mgr-73/src/jar/descriptor/src/java/org/mulgara/descriptor/PIErrorHandler.java
===================================================================
--- branches/mgr-73/src/jar/descriptor/src/java/org/mulgara/descriptor/PIErrorHandler.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/descriptor/src/java/org/mulgara/descriptor/PIErrorHandler.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import javax.xml.transform.*;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.xml.sax.*;
import org.xml.sax.helpers.LocatorImpl;
@@ -68,7 +68,7 @@
/**
* Description of the Field
*/
- private static Category log = Category.getInstance("XALAN");
+ private static final Logger log = Logger.getLogger("XALAN");
/**
* Description of the Field
Modified: branches/mgr-73/src/jar/itql/java/org/mulgara/itql/CollaboratorUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/itql/java/org/mulgara/itql/CollaboratorUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/itql/java/org/mulgara/itql/CollaboratorUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
// Third party packages
import java.io.IOException;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.soap.SOAPException;
/**
@@ -62,7 +62,7 @@
/** Logger. */
@SuppressWarnings("unused")
- private final static Category logger = Category.getInstance(CollaboratorUnitTest.class.getName());
+ private final static Logger logger = Logger.getLogger(CollaboratorUnitTest.class);
/**
* a flag to indicate if the collorator requires closing
Modified: branches/mgr-73/src/jar/itql/java/org/mulgara/itql/HelpPrinter.java
===================================================================
--- branches/mgr-73/src/jar/itql/java/org/mulgara/itql/HelpPrinter.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/itql/java/org/mulgara/itql/HelpPrinter.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -28,7 +28,7 @@
package org.mulgara.itql;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Automatically generated packages (SableCC)
import org.mulgara.itql.analysis.DepthFirstAdapter;
@@ -63,8 +63,7 @@
/**
* the category to log to
*/
- private final static Category log =
- Category.getInstance(HelpPrinter.class.getName());
+ private final static Logger log = Logger.getLogger(HelpPrinter.class);
/**
* Get line separator.
Modified: branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -48,7 +48,7 @@
// third party packages
import javax.xml.parsers.FactoryConfigurationError;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator; // Soap packages
// Soap packages
@@ -85,7 +85,7 @@
//
/** The category to send logging info to */
- private static Category log = Category.getInstance(ItqlInterpreterBeanUnitTest.class.getName());
+ private static final Logger log = Logger.getLogger(ItqlInterpreterBeanUnitTest.class);
/** Description of the Field */
private ItqlInterpreterBean bean = null;
Modified: branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlOptionParser.java
===================================================================
--- branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlOptionParser.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlOptionParser.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import jargs.gnu.CmdLineParser;
// third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Command line option parser for the iTQL interpreter.
@@ -114,8 +114,7 @@
/**
* the category to log to
*/
- private final static Category log =
- Category.getInstance(ItqlOptionParser.class.getName());
+ private final static Logger log = Logger.getLogger(ItqlOptionParser.class);
//
// members
Modified: branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlSession.java
===================================================================
--- branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlSession.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlSession.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -36,7 +36,7 @@
// Third party packages
import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
// Automatically generated packages (SableCC)
@@ -103,8 +103,7 @@
/**
* the logging category to log to
*/
- private final static Category log =
- Category.getInstance(ItqlSession.class.getName());
+ private final static Logger log = Logger.getLogger(ItqlSession.class);
/**
* the default path to the pre-loading script
Modified: branches/mgr-73/src/jar/itql/java/org/mulgara/itql/TqlSession.java
===================================================================
--- branches/mgr-73/src/jar/itql/java/org/mulgara/itql/TqlSession.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/itql/java/org/mulgara/itql/TqlSession.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -27,7 +27,7 @@
// Third party packages
import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
import org.mulgara.query.Answer;
@@ -65,7 +65,7 @@
private final static String LOG4J_CONFIG_PATH = "log4j-tql.xml";
/** The logging category to use */
- private final static Category log = Category.getInstance(TqlSession.class.getName());
+ private final static Logger log = Logger.getLogger(TqlSession.class);
/** The default path to the pre-loading script */
private final static String PRE_LOADING_SCRIPT_PATH = "default-pre.tql";
Modified: branches/mgr-73/src/jar/itql/sablecc/itql.grammar
===================================================================
--- branches/mgr-73/src/jar/itql/sablecc/itql.grammar 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/itql/sablecc/itql.grammar 2008-03-17 08:19:01 UTC (rev 681)
@@ -23,7 +23,8 @@
com, /* comment */
esc, /* escaping character in quoted literal with '\' */
lit, /* quoted literal */
- res, /* tagged resource */
+ begres, /* start of tagged resource */
+ endres, /* end of tagged resource */
var, /* escaping variable name with '$' */
lng; /* language code */
@@ -89,8 +90,8 @@
{def} terminator = ';';
{def} lpar = '(';
{def} rpar = ')';
- {def->res} url = '<';
- {res->def} endurl = '>';
+ {def->begres} url = '<';
+ {endres->def} endurl = '>';
{def} datatypeprefix = '^^';
{def->lng} languageprefix = '@';
{def->var} variableprefix = ('$' | '?');
@@ -98,7 +99,7 @@
{def} float = digit+ ('.' digit*) | ('.' digit+);
{lng->def} langid = letter letter | letter letter '-' letter letter;
- {res} resource = urlchar*;
+ {begres->endres} resource = urlchar*;
{def->lit, lit->def} quote = 39; /* ' */
{lit->esc} escape = '\';
{esc->lit} escapedtext = character;
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerImpl.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.mulgara.util.ResultSetRow;
import org.mulgara.util.TestResultSet;
@@ -81,8 +81,7 @@
/**
* Logger. This is named after the class.
*/
- private final static Category logger =
- Category.getInstance(AnswerImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(AnswerImpl.class);
static {
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerOperations.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerOperations.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerOperations.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -28,7 +28,7 @@
package org.mulgara.query;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Operations permitted on {@link Answer}s.
@@ -57,8 +57,7 @@
*
* This is named after the class.
*/
- private final static Category logger =
- Category.getInstance(AnswerOperations.class.getName());
+ private final static Logger logger = Logger.getLogger(AnswerOperations.class);
/**
* Equality is by value, with both row and column order significant.
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerOperationsUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerOperationsUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerOperationsUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.*;
// Log4J
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.util.MulgaraResultSet;
@@ -65,8 +65,7 @@
/**
* Logger.
*/
- private Category logger =
- Category.getInstance(AnswerOperationsUnitTest.class.getName());
+ private static final Logger logger = Logger.getLogger(AnswerOperationsUnitTest.class);
/**
* Test instance.
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/AnswerUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -36,7 +36,7 @@
import java.util.*;
// Log4J
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.util.MulgaraResultSet;
@@ -66,7 +66,7 @@
/**
* Logger.
*/
- private Category logger = Category.getInstance(AnswerUnitTest.class.getName());
+ private static final Logger logger = Logger.getLogger(AnswerUnitTest.class);
/**
* Test instance.
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintHaving.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintHaving.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintHaving.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.util.*;
// Third party packages
-// import org.apache.log4j.Category;
+// import org.apache.log4j.Logger;
import org.jrdf.graph.*;
@@ -61,7 +61,7 @@
public abstract class ConstraintHaving extends AbstractConstraintExpression implements Constraint {
// /** Logger. */
- // private final static Category logger = Category.getInstance(ConstraintHaving.class.getName());
+ // private final static Logger logger = Logger.getLogger(ConstraintHaving.class);
/**
* The 4-tuple of elements (either nodes or variables)
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintImpl.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.util.*;
// Third party packages
-// import org.apache.log4j.Category;
+// import org.apache.log4j.Logger;
/**
* A constraint. The elements within the constraint can be either variables or
@@ -67,7 +67,7 @@
static final long serialVersionUID = -3127160729187334757L;
// /** Logger. */
- // private final static Category logger = Category.getInstance(ConstraintImpl.class.getName());
+ // private final static Logger logger = Logger.getLogger(ConstraintImpl.class);
/**
* The 4-tuple of elements (either nodes or variables)
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintIs.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintIs.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintIs.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.util.*;
// Third party packages
-// import org.apache.log4j.Category;
+// import org.apache.log4j.Logger;
// Local packages
import org.mulgara.query.rdf.URIReferenceImpl;
@@ -65,7 +65,7 @@
private static final long serialVersionUID = 7952821738407976852L;
// /** Logger. */
- // private final static Category logger = Category.getInstance(ConstraintIs.class.getName());
+ // private final static Logger logger = Logger.getLogger(ConstraintIs.class);
/** Create the predicate to be used to indicate equality. */
public static final URIReferenceImpl MULGARA_IS = new URIReferenceImpl(SpecialPredicates.MULGARA_IS);
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintNotOccurs.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintNotOccurs.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintNotOccurs.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -28,7 +28,7 @@
package org.mulgara.query;
// Third party packages
-// import org.apache.log4j.Category;
+// import org.apache.log4j.Logger;
// Local packages
import org.mulgara.query.rdf.URIReferenceImpl;
@@ -57,7 +57,7 @@
public class ConstraintNotOccurs extends ConstraintHaving {
// /** Logger. */
- // private final static Category logger = Category.getInstance(ConstraintOccurs.class.getName());
+ // private final static Logger logger = Logger.getLogger(ConstraintOccurs.class);
/**
* Allow newer compiled version of the stub to operate when changes
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOccurs.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOccurs.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOccurs.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -28,7 +28,7 @@
package org.mulgara.query;
// Third party packages
-// import org.apache.log4j.Category;
+// import org.apache.log4j.Logger;
// Local packages
import org.mulgara.query.rdf.URIReferenceImpl;
@@ -57,7 +57,7 @@
public class ConstraintOccurs extends ConstraintHaving {
// /** Logger. */
- // private final static Category logger = Category.getInstance(ConstraintOccurs.class.getName());
+ // private final static Logger logger = Logger.getLogger(ConstraintOccurs.class);
/**
* Allow newer compiled version of the stub to operate when changes
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOccursLessThan.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOccursLessThan.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOccursLessThan.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -28,7 +28,7 @@
package org.mulgara.query;
// Third party packages
-// import org.apache.log4j.Category;
+// import org.apache.log4j.Logger;
// Local packages
import org.mulgara.query.rdf.URIReferenceImpl;
@@ -57,7 +57,7 @@
public class ConstraintOccursLessThan extends ConstraintHaving {
// /** Logger. */
- // private final static Category logger = Category.getInstance(ConstraintOccursLessThan.class.getName());
+ // private final static Logger logger = Logger.getLogger(ConstraintOccursLessThan.class);
/**
* Allow newer compiled version of the stub to operate when changes
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOccursMoreThan.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOccursMoreThan.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOccursMoreThan.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -28,7 +28,7 @@
package org.mulgara.query;
// Third party packages
-// import org.apache.log4j.Category;
+// import org.apache.log4j.Logger;
// Local packages
import org.mulgara.query.rdf.URIReferenceImpl;
@@ -57,7 +57,7 @@
public class ConstraintOccursMoreThan extends ConstraintHaving {
// /** Logger. */
- // private final static Category logger = Category.getInstance(ConstraintOccursMoreThan.class.getName());
+ // private final static Logger logger = Logger.getLogger(ConstraintOccursMoreThan.class);
/**
* Allow newer compiled version of the stub to operate when changes
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOperation.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOperation.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/ConstraintOperation.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.util.*;
// Third party packages
-// import org.apache.log4j.Category;
+// import org.apache.log4j.Logger;
/**
* A constraint expression composed of two subexpressions and a dyadic operator.
@@ -65,7 +65,7 @@
static final long serialVersionUID = -236847137057853871L;
// /** Logger. */
- // private static Category logger = Category.getInstance(ConstraintOperation.class.getName());
+ // private static Logger logger = Logger.getLogger(ConstraintOperation.class);
//
// Constructor
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/ModelLiteral.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/ModelLiteral.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/ModelLiteral.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -36,7 +36,7 @@
import javax.xml.transform.stream.StreamResult;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.xml.sax.InputSource;
/**
@@ -70,8 +70,7 @@
/**
* Logger. This is named after the class.
*/
- private final static Category logger =
- Category.getInstance(ModelLiteral.class.getName());
+ private final static Logger logger = Logger.getLogger(ModelLiteral.class);
/**
* The content of the model, an RDF syntax byte sequence.
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/ModelPartition.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/ModelPartition.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/ModelPartition.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -29,7 +29,7 @@
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* A model expression composed of the union of two subexpressions.
@@ -65,8 +65,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(ModelPartition.class.getName());
+ private final static Logger logger = Logger.getLogger(ModelPartition.class);
//
// Constructor
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/ModelResourceUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/ModelResourceUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/ModelResourceUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -34,7 +34,7 @@
import junit.framework.*;
// Log4J
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Tests the functionality of ModelResource.
@@ -59,8 +59,7 @@
/**
* Logger.
*/
- private Category logger =
- Category.getInstance(ModelResourceUnitTest.class.getName());
+ private static final Logger logger = Logger.getLogger(ModelResourceUnitTest.class);
/**
* Construct a new unit test.
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/QueryUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/QueryUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/QueryUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.*;
// Log4J
-// import org.apache.log4j.Category;
+// import org.apache.log4j.Logger;
// Locally written packages.
import org.mulgara.query.rdf.LiteralImpl;
@@ -57,7 +57,7 @@
private Query query;
// /** Logger. */
- // private Category logger = Category.getInstance(QueryUnitTest.class.getName());
+ // private static final Logger logger = Logger.getLogger(QueryUnitTest.class);
/**
* Constructs a new answer test with the given name.
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/SingleTransitiveConstraint.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/SingleTransitiveConstraint.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/SingleTransitiveConstraint.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.util.*;
// Third party packages
-// import org.apache.log4j.Category;
+// import org.apache.log4j.Logger;
/**
* A transitive constraint. The elements within the constraint must be variable
@@ -69,7 +69,7 @@
static final long serialVersionUID = -3828723182891026790L;
// /** Logger. */
- // private final static Category logger = Category.getInstance(Constraint.class.getName());
+ // private final static Logger logger = Logger.getLogger(Constraint.class);
/**
* The constraint containing the transitive predicate.
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/TransitiveConstraint.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/TransitiveConstraint.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/TransitiveConstraint.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.util.*;
// Third party packages
-// import org.apache.log4j.Category;
+// import org.apache.log4j.Logger;
/**
* A transitive constraint. The constraint must take the form of an anchored
@@ -69,7 +69,7 @@
static final long serialVersionUID = -3828723182891026790L;
// /** Logger. */
- // private final static Category logger = Category.getInstance(Constraint.class.getName());
+ // private final static Logger logger = Logger.getLogger(Constraint.class);
/**
* The constraint containing the anchored transitive predicate.
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/UnconstrainedAnswer.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/UnconstrainedAnswer.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/UnconstrainedAnswer.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.io.Serializable;
// Third party packages
-import org.apache.log4j.Category; // Apache Log4J
+import org.apache.log4j.Logger; // Apache Log4J
/**
* An {@link Answer} which is true no matter what value any variable takes.
@@ -68,8 +68,7 @@
*
* This is named after the class.
*/
- private static final Category logger =
- Category.getInstance(UnconstrainedAnswer.class.getName());
+ private static final Logger logger = Logger.getLogger(UnconstrainedAnswer.class);
/**
* The current row number.
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/WalkConstraint.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/WalkConstraint.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/WalkConstraint.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.util.*;
// Third party packages
-// import org.apache.log4j.Category;
+// import org.apache.log4j.Logger;
/**
* A walk constraint. The constraint must take the form of an anchored
@@ -68,7 +68,7 @@
static final long serialVersionUID = 1054509776341736706L;
// /** Logger. */
- // private final static Category logger = Category.getInstance(Constraint.class.getName());
+ // private final static Logger logger = Logger.getLogger(Constraint.class);
/**
* The constraint containing the anchored constraint.
Modified: branches/mgr-73/src/jar/query/java/org/mulgara/query/rdf/LiteralImplUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/query/java/org/mulgara/query/rdf/LiteralImplUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/query/java/org/mulgara/query/rdf/LiteralImplUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
// Third party packages
import junit.framework.*; // JUnit
-import org.apache.log4j.Category; // Log4J
+import org.apache.log4j.Logger; // Log4J
/**
* Test case for {@link LiteralImpl}.
@@ -62,8 +62,7 @@
*
* This is named after the class.
*/
- private Category logger =
- Category.getInstance(LiteralImplUnitTest.class.getName());
+ private static final Logger logger = Logger.getLogger(LiteralImplUnitTest.class);
/**
* Constructs a new test with the given name.
Modified: branches/mgr-73/src/jar/rdql/java/org/mulgara/rdql/RdqlOptionParser.java
===================================================================
--- branches/mgr-73/src/jar/rdql/java/org/mulgara/rdql/RdqlOptionParser.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/rdql/java/org/mulgara/rdql/RdqlOptionParser.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import jargs.gnu.CmdLineParser;
// third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Command line option parser for the iTQL interpreter.
@@ -114,8 +114,7 @@
/**
* the category to log to
*/
- private final static Category log =
- Category.getInstance(RdqlOptionParser.class.getName());
+ private final static Logger log = Logger.getLogger(RdqlOptionParser.class);
//
// members
Modified: branches/mgr-73/src/jar/rdql/java/org/mulgara/rdql/RdqlSession.java
===================================================================
--- branches/mgr-73/src/jar/rdql/java/org/mulgara/rdql/RdqlSession.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/rdql/java/org/mulgara/rdql/RdqlSession.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -36,7 +36,7 @@
// Third party packages
import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
// Automatically generated packages (SableCC)
@@ -109,8 +109,7 @@
/**
* the logging category to log to
*/
- private final static Category log =
- Category.getInstance(RdqlSession.class.getName());
+ private final static Logger log = Logger.getLogger(RdqlSession.class);
/**
* the default path to the pre-loading script
Modified: branches/mgr-73/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java
===================================================================
--- branches/mgr-73/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -37,7 +37,7 @@
import java.util.Map;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.lucene.document.Document;
import org.apache.lucene.search.Hits;
@@ -79,8 +79,7 @@
Cloneable {
/** Logger. */
- private final static Category logger =
- Category.getInstance(FullTextStringIndexTuples.class.getName());
+ private final static Logger logger = Logger.getLogger(FullTextStringIndexTuples.class);
/** Description of the Field */
private final static String SCORE_COLUMN = "score";
Modified: branches/mgr-73/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreDuplicateResolution.java
===================================================================
--- branches/mgr-73/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreDuplicateResolution.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreDuplicateResolution.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -30,7 +30,7 @@
package org.mulgara.resolver.store;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Standard Java packages
import java.util.*;
@@ -80,8 +80,7 @@
*/
class StatementStoreDuplicateResolution extends AbstractTuples implements Resolution {
- protected static Category logger =
- Category.getInstance(StatementStoreDuplicateResolution.class.getName());
+ protected static Logger logger = Logger.getLogger(StatementStoreDuplicateResolution.class);
/**
* The constraint these tuples were generated to satisfy.
Modified: branches/mgr-73/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreInverseResolution.java
===================================================================
--- branches/mgr-73/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreInverseResolution.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreInverseResolution.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -30,7 +30,7 @@
package org.mulgara.resolver.store;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Standard Java packages
import java.util.*;
@@ -71,8 +71,7 @@
*/
class StatementStoreInverseResolution extends AbstractTuples implements Resolution {
- protected static Category logger =
- Category.getInstance(StatementStoreInverseResolution.class.getName());
+ protected static final Logger logger = Logger.getLogger(StatementStoreInverseResolution.class);
/**
* The constraint these tuples were generated to satisfy.
Modified: branches/mgr-73/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolution.java
===================================================================
--- branches/mgr-73/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolution.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolution.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
package org.mulgara.resolver.store;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Standard Java packages
import java.util.*;
@@ -72,8 +72,7 @@
private final static long ROWCOUNT_UNCALCULATED = -1;
private final static int ROWCARD_UNCALCULATED = -1;
- private final static Category logger =
- Category.getInstance(StatementStoreResolution.class.getName());
+ private final static Logger logger = Logger.getLogger(StatementStoreResolution.class);
/** The constraint these tuples were generated to satisfy. */
private Constraint constraint;
Modified: branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java
===================================================================
--- branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -34,7 +34,7 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.Constraint;
@@ -70,8 +70,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(TripleAVLFile.class.getName());
+ private final static Logger logger = Logger.getLogger(TripleAVLFile.class);
/**
* Get line separator.
Modified: branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFileUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFileUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFileUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -34,7 +34,7 @@
// Third party packages
import junit.framework.*;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.*;
@@ -71,8 +71,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(TripleAVLFileUnitTest.class.getName());
+ private final static Logger logger = Logger.getLogger(TripleAVLFileUnitTest.class);
/**
* Description of the Field
Modified: branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleWriteThread.java
===================================================================
--- branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleWriteThread.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleWriteThread.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.util.LinkedList;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.statement.*;
@@ -42,8 +42,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(TripleWriteThread.class.getName());
+ private final static Logger logger = Logger.getLogger(TripleWriteThread.class);
private static final int BUFFER_SIZE = 50000;
Modified: branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/XAStatementStoreImpl.java
===================================================================
--- branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/XAStatementStoreImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/XAStatementStoreImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.*;
@@ -78,8 +78,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(XAStatementStoreImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(XAStatementStoreImpl.class);
final static boolean RELEASE_NODE_LISTENERS_ENABLED = false;
Modified: branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/XAStatementStoreImplUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/XAStatementStoreImplUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/resolver-store/java/org/mulgara/store/statement/xa/XAStatementStoreImplUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -69,8 +69,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(XAStatementStoreImplUnitTest.class.getName());
+ private final static Logger logger = Logger.getLogger(XAStatementStoreImplUnitTest.class);
/**
* start of filenames to build the graph with.
Modified: branches/mgr-73/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -76,8 +76,7 @@
public class TestResolverUnitTest extends TestCase {
/** Logger. */
- private final static Category logger =
- Category.getInstance(TestResolverUnitTest.class.getName());
+ private final static Logger logger = Logger.getLogger(TestResolverUnitTest.class);
/**
* Test {@link Database} used to generate
Modified: branches/mgr-73/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraOptionParser.java
===================================================================
--- branches/mgr-73/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraOptionParser.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraOptionParser.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import jargs.gnu.CmdLineParser;
// third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Command line option parser for the Mulgara server.
@@ -126,8 +126,7 @@
/**
* the category to log to
*/
- private final static Category log =
- Category.getInstance(EmbeddedMulgaraOptionParser.class.getName());
+ private final static Logger log = Logger.getLogger(EmbeddedMulgaraOptionParser.class);
//
// members
Modified: branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/BEEPAnswer.java
===================================================================
--- branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/BEEPAnswer.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/BEEPAnswer.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.io.*;
// Third party packages
-import org.apache.log4j.Category; // Apache Log4J
+import org.apache.log4j.Logger; // Apache Log4J
import org.beepcore.beep.core.BEEPException; // BEEP
import org.beepcore.beep.core.Channel;
import org.beepcore.beep.core.Message;
@@ -62,8 +62,7 @@
/**
* Logger.
*/
- private static final Category logger =
- Category.getInstance(BEEPAnswer.class.getName());
+ private static final Logger logger = Logger.getLogger(BEEPAnswer.class);
/**
* The BEEP channel to close once this instance is closed.
Modified: branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/BEEPSession.java
===================================================================
--- branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/BEEPSession.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/BEEPSession.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import javax.transaction.xa.XAResource;
// Third party packages
-import org.apache.log4j.Category; // Apache Log4J
+import org.apache.log4j.Logger; // Apache Log4J
import org.beepcore.beep.core.BEEPException; // BEEP
import org.beepcore.beep.core.ByteOutputDataStream;
import org.beepcore.beep.core.Channel;
@@ -92,8 +92,7 @@
*
* This is named after the class.
*/
- private static final Category logger =
- Category.getInstance(BEEPSession.class.getName());
+ private static final Logger logger = Logger.getLogger(BEEPSession.class);
/**
* The wrapped BEEP session.
Modified: branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/CommandProfile.java
===================================================================
--- branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/CommandProfile.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/CommandProfile.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -4,7 +4,7 @@
import java.io.*;
// Third party packages
-import org.apache.log4j.Category; // Log4J
+import org.apache.log4j.Logger; // Log4J
import org.beepcore.beep.core.*; // BEEP
import org.beepcore.beep.profile.*;
@@ -30,7 +30,7 @@
/**
* Logger.
*/
- private final Category logger = Category.getInstance(getClass().getName());
+ private final static Logger logger = Logger.getLogger(CommandProfile.class);
/**
* The Mulgara session wrapped by this BEEP session.
Modified: branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/CommandRequestHandler.java
===================================================================
--- branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/CommandRequestHandler.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/CommandRequestHandler.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -5,7 +5,7 @@
import java.util.StringTokenizer;
// Third party packages
-import org.apache.log4j.Category; // Log4J
+import org.apache.log4j.Logger; // Log4J
import org.beepcore.beep.core.*; // BEEP
// Local packages
@@ -22,7 +22,7 @@
/**
* Logger.
*/
- private final Category logger = Category.getInstance(getClass().getName());
+ private final static Logger logger = Logger.getLogger(CommandRequestHandler.class);
/**
* The Mulgara session wrapped by this BEEP session.
Modified: branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/QueryProfile.java
===================================================================
--- branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/QueryProfile.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/QueryProfile.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -4,7 +4,7 @@
import java.io.*;
// Third party packages
-import org.apache.log4j.Category; // Log4J
+import org.apache.log4j.Logger; // Log4J
import org.beepcore.beep.core.*; // BEEP
import org.beepcore.beep.profile.*;
@@ -30,7 +30,7 @@
/**
* Logger.
*/
- private final Category logger = Category.getInstance(getClass().getName());
+ private final static Logger logger = Logger.getLogger(QueryProfile.class);
/**
* The Mulgara session wrapped by this BEEP session.
Modified: branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/QueryRequestHandler.java
===================================================================
--- branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/QueryRequestHandler.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/server-beep/java/org/mulgara/server/beep/QueryRequestHandler.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -4,7 +4,7 @@
import java.io.*;
// Third party packages
-import org.apache.log4j.Category; // Log4J
+import org.apache.log4j.Logger; // Log4J
import org.beepcore.beep.core.*; // BEEP
// Local packages
@@ -22,9 +22,9 @@
public class QueryRequestHandler implements RequestHandler
{
/**
- * Logger.
- */
- private final Category logger = Category.getInstance(getClass().getName());
+ * Logger.
+ */
+ private final static Logger logger = Logger.getLogger(QueryRequestHandler.class);
/**
* The Mulgara session wrapped by this BEEP session.
Modified: branches/mgr-73/src/jar/server-http/java/org/mulgara/server/http/HttpSessionFactory.java
===================================================================
--- branches/mgr-73/src/jar/server-http/java/org/mulgara/server/http/HttpSessionFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/server-http/java/org/mulgara/server/http/HttpSessionFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -185,8 +185,7 @@
* Logger.
*
*/
- final static Category logger =
- Category.getInstance(InvocationHandlerImpl.class.getName());
+ final static Logger logger = Logger.getLogger(InvocationHandlerImpl.class);
private URL serverURL;
Modified: branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerPageImplUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerPageImplUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerPageImplUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -36,7 +36,7 @@
import java.sql.*;
// Log4J
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.*;
@@ -67,7 +67,7 @@
/**
* Logger.
*/
- private Category logger = Category.getInstance(AnswerPageImplUnitTest.class.getName());
+ private static final Logger logger = Logger.getLogger(AnswerPageImplUnitTest.class);
/**
* Constructs a new answer test with the given name.
Modified: branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerWrapperRemoteAnswerSerialised.java
===================================================================
--- branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerWrapperRemoteAnswerSerialised.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerWrapperRemoteAnswerSerialised.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,6 @@
import java.io.Serializable;
// Third party packages
-import org.apache.log4j.Category;
import org.mulgara.query.Answer;
import org.mulgara.query.TuplesException;
import org.mulgara.query.Variable;
Modified: branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/PagedRemoteAnswer.java
===================================================================
--- branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/PagedRemoteAnswer.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/PagedRemoteAnswer.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,6 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Category;
import org.mulgara.query.TuplesException;
import org.mulgara.query.Variable;
import org.mulgara.util.MulgaraResultSet;
Modified: branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteAnswer.java
===================================================================
--- branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteAnswer.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteAnswer.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,6 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Category;
import org.mulgara.query.TuplesException;
import org.mulgara.query.Variable;
import org.mulgara.util.MulgaraResultSet;
Modified: branches/mgr-73/src/jar/sparql-protocol/java/org/mulgara/sparql/protocol/StreamAnswerTest.java
===================================================================
--- branches/mgr-73/src/jar/sparql-protocol/java/org/mulgara/sparql/protocol/StreamAnswerTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/sparql-protocol/java/org/mulgara/sparql/protocol/StreamAnswerTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
// Third party packages
import junit.framework.*; // JUnit
import junit.textui.TestRunner;
-import org.apache.log4j.Category; // Log4J
+import org.apache.log4j.Logger; // Log4J
import org.jrdf.graph.Literal; // JRDF
import org.jrdf.graph.URIReference;
@@ -64,7 +64,7 @@
/**
* Logger.
*/
- private Category logger = Category.getInstance(getClass().getName());
+ private static final Logger logger = Logger.getLogger(StreamAnswerTest.class);
/**
* Constructs a new answer test with the given name.
Modified: branches/mgr-73/src/jar/store-nodepool-xa/java/org/mulgara/store/nodepool/xa/XANodePoolImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-nodepool-xa/java/org/mulgara/store/nodepool/xa/XANodePoolImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-nodepool-xa/java/org/mulgara/store/nodepool/xa/XANodePoolImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.util.*;
// Third-party packages
-import org.apache.log4j.Category; // log4j classes
+import org.apache.log4j.Logger; // log4j classes
// Locally written packages
import org.mulgara.store.nodepool.*;
@@ -62,8 +62,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(XANodePoolImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(XANodePoolImpl.class);
/**
* Description of the Field
Modified: branches/mgr-73/src/jar/store-nodepool-xa/java/org/mulgara/store/nodepool/xa/XANodePoolImplTest.java
===================================================================
--- branches/mgr-73/src/jar/store-nodepool-xa/java/org/mulgara/store/nodepool/xa/XANodePoolImplTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-nodepool-xa/java/org/mulgara/store/nodepool/xa/XANodePoolImplTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
// Third party packages
import junit.framework.*;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.*;
@@ -58,8 +58,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(XANodePoolImplTest.class.getName());
+ private final static Logger logger = Logger.getLogger(XANodePoolImplTest.class);
/**
* Description of the Field
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPObject.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPObject.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPObject.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,6 @@
import java.nio.charset.Charset;
// Third party packages
-import org.apache.log4j.Category;
// Locally written packages
import org.mulgara.store.stringpool.*;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPStringComparator.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPStringComparator.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPStringComparator.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,6 @@
import java.nio.CharBuffer;
// Third party packages
-import org.apache.log4j.Category;
// Locally written packages
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPTypedLiteral.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPTypedLiteral.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPTypedLiteral.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.rdf.LiteralImpl;
@@ -63,8 +63,7 @@
public abstract class AbstractSPTypedLiteral extends AbstractSPObject
implements SPTypedLiteral {
- private static final Category logger =
- Category.getInstance(AbstractSPTypedLiteral.class.getName());
+ private static final Logger logger = Logger.getLogger(AbstractSPTypedLiteral.class);
protected int typeId;
protected int subtypeId;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/StringPoolAbstractTest.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/StringPoolAbstractTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/StringPoolAbstractTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.*;
// Log4J
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.nodepool.NodePool;
@@ -65,8 +65,7 @@
/**
* The category to log to.
*/
- private static Category log =
- Category.getInstance(StringPoolAbstractTest.class.getName());
+ private static final Logger log = Logger.getLogger(StringPoolAbstractTest.class);
/**
* Subclasses must initialize this field.
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.rdf.*;
@@ -59,8 +59,7 @@
*/
public final class SPBase64BinaryFactory implements SPTypedLiteralFactory {
- private final static Category logger =
- Category.getInstance(SPBase64BinaryFactory.class.getName());
+ private final static Logger logger = Logger.getLogger(SPBase64BinaryFactory.class);
/**
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -66,8 +66,7 @@
implements SPTypedLiteral {
/** Logger */
- private static final Category logger =
- Category.getInstance(SPBase64BinaryImpl.class.getName());
+ private static final Logger logger = Logger.getLogger(SPBase64BinaryImpl.class);
/** Type code that identifies this type */
static final int TYPE_ID = 13;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBinaryComparator.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBinaryComparator.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBinaryComparator.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,6 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
// Locally written packages
import org.mulgara.store.stringpool.SPComparator;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.rdf.*;
@@ -59,8 +59,7 @@
*/
public final class SPBooleanFactory implements SPTypedLiteralFactory {
- private final static Category logger =
- Category.getInstance(SPBooleanFactory.class.getName());
+ private final static Logger logger = Logger.getLogger(SPBooleanFactory.class);
/**
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -64,8 +64,7 @@
implements SPTypedLiteral {
/** Logger */
- private static final Category logger =
- Category.getInstance(SPBooleanImpl.class.getName());
+ private static final Logger logger = Logger.getLogger(SPBooleanImpl.class);
/** Type code that identifies this type */
static final int TYPE_ID = 12;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPCaseInsensitiveStringComparator.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPCaseInsensitiveStringComparator.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPCaseInsensitiveStringComparator.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,6 @@
import java.nio.CharBuffer;
// Third party packages
-import org.apache.log4j.Category;
// Locally written packages
import org.mulgara.store.stringpool.AbstractSPStringComparator;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPCaseSensitiveStringComparator.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPCaseSensitiveStringComparator.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPCaseSensitiveStringComparator.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,6 @@
import java.nio.CharBuffer;
// Third party packages
-import org.apache.log4j.Category;
// Locally written packages
import org.mulgara.store.stringpool.AbstractSPStringComparator;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.stringpool.*;
@@ -58,8 +58,7 @@
*/
public final class SPDateFactory implements SPTypedLiteralFactory {
- private final static Category logger =
- Category.getInstance(SPDateFactory.class.getName());
+ private final static Logger logger = Logger.getLogger(SPDateFactory.class);
public int getTypeId() {
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.Locale;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Date utils
import com.mousepushers.date.DateParser;
@@ -69,8 +69,7 @@
*/
public final class SPDateImpl extends AbstractSPTypedLiteral {
- private final static Category logger =
- Category.getInstance(SPDateImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(SPDateImpl.class);
static final int TYPE_ID = 5; // Unique ID
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.stringpool.*;
@@ -58,8 +58,7 @@
*/
public final class SPDateTimeFactory implements SPTypedLiteralFactory {
- private final static Category logger =
- Category.getInstance(SPDateTimeFactory.class.getName());
+ private final static Logger logger = Logger.getLogger(SPDateTimeFactory.class);
public int getTypeId() {
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.Locale;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Date utils
import com.mousepushers.date.DateParser;
@@ -69,8 +69,7 @@
*/
public final class SPDateTimeImpl extends AbstractSPTypedLiteral {
- private final static Category logger =
- Category.getInstance(SPDateTimeImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(SPDateTimeImpl.class);
static final int TYPE_ID = 6; // Unique ID
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.rdf.XSD;
@@ -61,8 +61,7 @@
*/
public final class SPDecimalFactory implements SPTypedLiteralFactory {
- private final static Category logger =
- Category.getInstance(SPDecimalFactory.class.getName());
+ private final static Logger logger = Logger.getLogger(SPDecimalFactory.class);
private final static URI[] TYPE_URIS = {
URI.create(XSD.NAMESPACE + "decimal"),
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.rdf.XSD;
@@ -63,8 +63,7 @@
*/
public final class SPDecimalImpl extends AbstractSPTypedLiteral {
- private final static Category logger =
- Category.getInstance(SPDecimalImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(SPDecimalImpl.class);
private long l;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.stringpool.*;
@@ -60,8 +60,7 @@
*/
public final class SPDoubleFactory implements SPTypedLiteralFactory {
- private final static Category logger =
- Category.getInstance(SPDoubleFactory.class.getName());
+ private final static Logger logger = Logger.getLogger(SPDoubleFactory.class);
public int getTypeId() {
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.rdf.XSD;
@@ -62,8 +62,7 @@
public final class SPDoubleImpl extends AbstractSPTypedLiteral
implements SPDouble {
- private final static Category logger =
- Category.getInstance(SPDoubleImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(SPDoubleImpl.class);
private double d;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.stringpool.*;
@@ -60,8 +60,7 @@
*/
public final class SPFloatFactory implements SPTypedLiteralFactory {
- private final static Category logger =
- Category.getInstance(SPFloatFactory.class.getName());
+ private final static Logger logger = Logger.getLogger(SPFloatFactory.class);
public int getTypeId() {
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.rdf.XSD;
@@ -61,8 +61,7 @@
*/
public final class SPFloatImpl extends AbstractSPTypedLiteral {
- private final static Category logger =
- Category.getInstance(SPFloatImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(SPFloatImpl.class);
private float f;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.stringpool.*;
@@ -61,8 +61,7 @@
public final class SPGDayFactory implements SPTypedLiteralFactory {
/** Logging for the class */
- private final static Category logger =
- Category.getInstance(SPGDayFactory.class);
+ private final static Logger logger = Logger.getLogger(SPGDayFactory.class);
/**
* Retrieves the type id for this data type.
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.Calendar;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDDayType;
import com.hp.hpl.jena.datatypes.xsd.XSDDateTime;
import com.hp.hpl.jena.datatypes.DatatypeFormatException;
@@ -67,8 +67,7 @@
*/
public final class SPGDayImpl extends AbstractSPTypedLiteral {
- private final static Category logger =
- Category.getInstance(SPGDayImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(SPGDayImpl.class);
/** The date representation for the day */
private Calendar day;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.stringpool.*;
@@ -61,8 +61,7 @@
public final class SPGMonthDayFactory implements SPTypedLiteralFactory {
/** Logging for the class */
- private final static Category logger =
- Category.getInstance(SPGMonthDayFactory.class);
+ private final static Logger logger = Logger.getLogger(SPGMonthDayFactory.class);
/**
* Retrieves the type id for this data type.
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.Calendar;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDMonthDayType;
import com.hp.hpl.jena.datatypes.xsd.XSDDateTime;
import com.hp.hpl.jena.datatypes.DatatypeFormatException;
@@ -68,8 +68,7 @@
*/
public final class SPGMonthDayImpl extends AbstractSPTypedLiteral {
- private final static Category logger =
- Category.getInstance(SPGMonthDayImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(SPGMonthDayImpl.class);
/** The date representation for the monthDay */
private Calendar monthDay;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.stringpool.*;
@@ -61,8 +61,7 @@
public final class SPGMonthFactory implements SPTypedLiteralFactory {
/** Logging for the class */
- private final static Category logger =
- Category.getInstance(SPGMonthFactory.class);
+ private final static Logger logger = Logger.getLogger(SPGMonthFactory.class);
/**
* Retrieves the type id for this data type.
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.Calendar;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDMonthType;
import com.hp.hpl.jena.datatypes.xsd.XSDDateTime;
import com.hp.hpl.jena.datatypes.DatatypeFormatException;
@@ -67,8 +67,7 @@
*/
public final class SPGMonthImpl extends AbstractSPTypedLiteral {
- private final static Category logger =
- Category.getInstance(SPGMonthImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(SPGMonthImpl.class);
/** The date representation for the month */
private Calendar month;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.stringpool.*;
@@ -61,8 +61,7 @@
public final class SPGYearFactory implements SPTypedLiteralFactory {
/** Logging for the class */
- private final static Category logger =
- Category.getInstance(SPGYearFactory.class);
+ private final static Logger logger = Logger.getLogger(SPGYearFactory.class);
/**
* Retrieves the type id for this data type.
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.Calendar;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDYearType;
import com.hp.hpl.jena.datatypes.xsd.XSDDateTime;
import com.hp.hpl.jena.datatypes.DatatypeFormatException;
@@ -67,8 +67,7 @@
*/
public final class SPGYearImpl extends AbstractSPTypedLiteral {
- private final static Category logger =
- Category.getInstance(SPGYearImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(SPGYearImpl.class);
/** The date representation for the year */
private Calendar year;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.stringpool.*;
@@ -61,8 +61,7 @@
public final class SPGYearMonthFactory implements SPTypedLiteralFactory {
/** Logging for the class */
- private final static Category logger =
- Category.getInstance(SPGYearMonthFactory.class);
+ private final static Logger logger = Logger.getLogger(SPGYearMonthFactory.class);
/**
* Retrieves the type id for this data type.
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.Calendar;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDYearMonthType;
import com.hp.hpl.jena.datatypes.xsd.XSDDateTime;
import com.hp.hpl.jena.datatypes.DatatypeFormatException;
@@ -68,8 +68,7 @@
*/
public final class SPGYearMonthImpl extends AbstractSPTypedLiteral {
- private final static Category logger =
- Category.getInstance(SPGYearMonthImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(SPGYearMonthImpl.class);
/** The date representation for the yearMonth */
private Calendar yearMonth;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.rdf.*;
@@ -59,8 +59,7 @@
*/
public final class SPHexBinaryFactory implements SPTypedLiteralFactory {
- private final static Category logger =
- Category.getInstance(SPHexBinaryFactory.class.getName());
+ private final static Logger logger = Logger.getLogger(SPHexBinaryFactory.class);
/**
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -66,8 +66,7 @@
implements SPTypedLiteral {
/** Logger */
- private static final Category logger =
- Category.getInstance(SPHexBinaryImpl.class.getName());
+ private static final Logger logger = Logger.getLogger(SPHexBinaryImpl.class);
/** Type code that identifies this type */
static final int TYPE_ID = 14;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPObjectFactoryImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPObjectFactoryImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPObjectFactoryImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -36,7 +36,6 @@
import org.jrdf.graph.URIReference;
// Third party packages
-import org.apache.log4j.Category;
// Locally written packages
import org.mulgara.store.stringpool.*;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPStringImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPStringImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPStringImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.rdf.LiteralImpl;
@@ -60,8 +60,7 @@
*/
public final class SPStringImpl extends AbstractSPObject implements SPString {
- private final static Category logger =
- Category.getInstance(SPStringImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(SPStringImpl.class);
private String str;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPTypedLiteralRegistry.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPTypedLiteralRegistry.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPTypedLiteralRegistry.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.rdf.LiteralImpl;
@@ -62,8 +62,7 @@
*/
public abstract class SPTypedLiteralRegistry {
- private static final Category logger =
- Category.getInstance(SPTypedLiteralRegistry.class.getName());
+ private static final Logger logger = Logger.getLogger(SPTypedLiteralRegistry.class);
// TODO the class names of these factories should be in a configuration file.
private static final SPTypedLiteralFactory[] DATATYPE_HANDLERS = {
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPURIImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPURIImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPURIImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.net.URI;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.rdf.URIReferenceImpl;
@@ -64,8 +64,7 @@
/**
* Description of the Field
*/
- private final static Category logger =
- Category.getInstance(SPURIImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(SPURIImpl.class);
private URI uri;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.stringpool.*;
@@ -57,8 +57,7 @@
*/
public final class SPXMLLiteralFactory implements SPTypedLiteralFactory {
- private final static Category logger =
- Category.getInstance(SPXMLLiteralFactory.class.getName());
+ private final static Logger logger = Logger.getLogger(SPXMLLiteralFactory.class);
public int getTypeId() {
return SPXMLLiteralImpl.TYPE_ID;
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -71,8 +71,7 @@
/**
* Logger
*/
- private static final Category logger =
- Category.getInstance(SPXMLLiteralImpl.class.getName());
+ private static final Logger logger = Logger.getLogger(SPXMLLiteralImpl.class);
/**
* Type code that identifies this type
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringFactory.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.store.stringpool.*;
@@ -60,8 +60,7 @@
*/
public final class SPXSDStringFactory implements SPTypedLiteralFactory {
- private final static Category logger =
- Category.getInstance(SPXSDStringFactory.class.getName());
+ private final static Logger logger = Logger.getLogger(SPXSDStringFactory.class);
public int getTypeId() {
Modified: branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.nio.ByteBuffer;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.rdf.XSD;
@@ -63,8 +63,7 @@
*/
public final class SPXSDStringImpl extends AbstractSPTypedLiteral {
- private final static Category logger =
- Category.getInstance(SPXSDStringImpl.class.getName());
+ private final static Logger logger = Logger.getLogger(SPXSDStringImpl.class);
private String str;
Modified: branches/mgr-73/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -203,7 +203,7 @@
}
else {
- if (logger.isEnabledFor(Priority.ERROR)) {
+ if (logger.isEnabledFor(Level.ERROR)) {
logger.error("The retrieved node and the given node were unequal " +
"when removing node: " + gNode);
Modified: branches/mgr-73/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImplTest.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImplTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImplTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -34,7 +34,6 @@
// third party packages
import junit.framework.*;
-import org.apache.log4j.Category;
// Locally written packages
import org.mulgara.query.rdf.XSD;
Modified: branches/mgr-73/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImpl.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -79,8 +79,7 @@
public final class XAStringPoolImpl implements XAStringPool {
/** Logger. */
- private static final Category logger =
- Category.getInstance(XAStringPoolImpl.class.getName());
+ private static final Logger logger = Logger.getLogger(XAStringPoolImpl.class);
/** Single setting to enable the cache. */
private static final boolean CACHE_ENABLED = true;
Modified: branches/mgr-73/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImplTest.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImplTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImplTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -36,7 +36,7 @@
// third party packages
import junit.framework.*;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// locally written packages
@@ -76,8 +76,7 @@
*/
public class XAStringPoolImplTest extends StringPoolAbstractTest {
- private final static Category logger =
- Category.getInstance(XAStringPoolImplTest.class.getName());
+ private final static Logger logger = Logger.getLogger(XAStringPoolImplTest.class);
/**
Modified: branches/mgr-73/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolLoadTest.java
===================================================================
--- branches/mgr-73/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolLoadTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolLoadTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -34,7 +34,7 @@
// third party packages
import junit.framework.*;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// locally written packages
import org.mulgara.store.stringpool.*;
@@ -66,8 +66,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(XAStringPoolLoadTest.class.getName());
+ private final static Logger logger = Logger.getLogger(XAStringPoolLoadTest.class);
/**
* Description of the Field
Modified: branches/mgr-73/src/jar/store-xa/java/org/mulgara/store/xa/SimpleXAResourceException.java
===================================================================
--- branches/mgr-73/src/jar/store-xa/java/org/mulgara/store/xa/SimpleXAResourceException.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/store-xa/java/org/mulgara/store/xa/SimpleXAResourceException.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -29,7 +29,7 @@
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* @created 2001-09-20
@@ -54,8 +54,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(SimpleXAResourceException.class.getName());
+ private final static Logger logger = Logger.getLogger(SimpleXAResourceException.class);
public SimpleXAResourceException(String message) {
super(message);
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/ConstrainedNegationTuples.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/ConstrainedNegationTuples.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/ConstrainedNegationTuples.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -30,7 +30,7 @@
package org.mulgara.store.tuples;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Standard Java packages
import java.util.*;
@@ -66,8 +66,7 @@
*/
class ConstrainedNegationTuples extends AbstractTuples {
- protected static Category logger =
- Category.getInstance(ConstrainedNegationTuples.class.getName());
+ protected static final Logger logger = Logger.getLogger(ConstrainedNegationTuples.class);
/**
* The constraint these tuples were generated to satisfy.
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DefaultRowComparator.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DefaultRowComparator.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DefaultRowComparator.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.util.Arrays;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Local packages
import org.mulgara.query.TuplesException;
@@ -62,8 +62,7 @@
/**
* Description of the Field
*/
- static Category logger =
- Category.getInstance(DefaultRowComparator.class.getName());
+ private static final Logger logger = Logger.getLogger(DefaultRowComparator.class);
/**
* Description of the Field
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DenseLongMatrix.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DenseLongMatrix.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DenseLongMatrix.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -27,7 +27,7 @@
package org.mulgara.store.tuples;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.mulgara.query.TuplesException;
@@ -44,8 +44,7 @@
*/
public class DenseLongMatrix {
- private final static Category logger =
- Category.getInstance(DenseLongMatrix.class.getName());
+ private final static Logger logger = Logger.getLogger(DenseLongMatrix.class);
private long[] matrix;
private int rows;
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DifferenceUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DifferenceUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DifferenceUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -29,7 +29,7 @@
// Third party packages
import junit.framework.*; // JUnit
-import org.apache.log4j.Category; // Log4J
+import org.apache.log4j.Logger; // Log4J
// Locally written packages
import org.mulgara.query.TuplesException;
@@ -55,6 +55,11 @@
*/
public class DifferenceUnitTest extends TestCase {
+ /**
+ * Logger.
+ */
+ private static final Logger logger = Logger.getLogger(DifferenceUnitTest.class);
+
/** Test variable. */
final Variable x = new Variable("x");
@@ -74,12 +79,6 @@
final Variable v = new Variable("v");
/**
- * Logger.
- */
- private Category logger =
- Category.getInstance(DifferenceUnitTest.class.getName());
-
- /**
* Constructs a new test with the given name.
*
* @param name the name of the test
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DistinctTuples.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DistinctTuples.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DistinctTuples.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.util.Collections;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.TuplesException;
@@ -62,8 +62,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(DistinctTuples.class.getName());
+ private static final Logger logger = Logger.getLogger(DistinctTuples.class);
/**
* The proposition to filter.
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DistinctTuplesUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DistinctTuplesUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/DistinctTuplesUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -29,7 +29,7 @@
// Third party packages
import junit.framework.*; // JUnit
-import org.apache.log4j.Category; // Log4J
+import org.apache.log4j.Logger; // Log4J
// Locally written packages
import org.mulgara.query.Variable;
@@ -59,8 +59,7 @@
/**
* Logger.
*/
- private Category logger =
- Category.getInstance(DistinctTuplesUnitTest.class.getName());
+ private static final Logger logger = Logger.getLogger(DistinctTuplesUnitTest.class);
/**
* Constructs a new test with the given name.
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/HavingPredicates.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/HavingPredicates.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/HavingPredicates.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,6 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Category; // Apache Log4J
import org.jrdf.graph.Node;
// Local packages
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/JoinTuples.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/JoinTuples.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/JoinTuples.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -27,7 +27,7 @@
// Java 2 standard packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.mulgara.query.TuplesException;
import org.mulgara.query.Variable;
@@ -57,7 +57,7 @@
/**
* Logger.
*/
- protected static Category logger;
+ protected static Logger logger;
/**
* Version of {@link #operandBinding}} including only columns to the left of
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/LimitedTuples.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/LimitedTuples.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/LimitedTuples.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -28,7 +28,7 @@
package org.mulgara.store.tuples;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.TuplesException;
@@ -58,8 +58,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(LimitedTuples.class.getName());
+ private final static Logger logger = Logger.getLogger(LimitedTuples.class);
/**
* The maximum number of minterms (rows) to allow through.
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/LiteralTuplesUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/LiteralTuplesUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/LiteralTuplesUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Category; // Apache Log4J
+import org.apache.log4j.Logger; // Apache Log4J
import junit.framework.*; // JUnit
// Local packages
@@ -65,8 +65,7 @@
/**
* Logger.
*/
- private Category logger =
- Category.getInstance(LiteralTuplesUnitTest.class.getName());
+ private static final Logger logger = Logger.getLogger(LiteralTuplesUnitTest.class);
/**
* Constructs a new test with the given name.
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/OffsetTuples.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/OffsetTuples.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/OffsetTuples.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -28,7 +28,7 @@
package org.mulgara.store.tuples;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.TuplesException;
@@ -58,8 +58,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(OffsetTuples.class.getName());
+ private final static Logger logger = Logger.getLogger(OffsetTuples.class);
/**
* The maximum number of minterms (rows) to allow through.
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/OrderedProjection.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/OrderedProjection.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/OrderedProjection.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.util.*;
// Locally written packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.mulgara.query.TuplesException;
import org.mulgara.query.Variable;
@@ -63,8 +63,7 @@
* Logger.
*
*/
- private final static Category logger =
- Category.getInstance(OrderedProjection.class.getName());
+ private final static Logger logger = Logger.getLogger(OrderedProjection.class);
/**
* The proposition to project.
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/OrderedProjectionUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/OrderedProjectionUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/OrderedProjectionUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -34,7 +34,7 @@
import junit.framework.*;
// Log4J
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// locally written packages
import org.mulgara.query.Variable;
@@ -64,8 +64,7 @@
/**
* Logger.
*/
- private Category logger =
- Category.getInstance(OrderedProjectionUnitTest.class.getName());
+ private static final Logger logger = Logger.getLogger(OrderedProjectionUnitTest.class);
/**
* Constructs a new test with the given name.
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicate.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicate.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicate.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -30,9 +30,6 @@
// Java 2 standard packages
import java.util.*;
-// Third party packages
-import org.apache.log4j.Category; // Apache Log4J
-
// Local packages
import org.mulgara.query.TuplesException;
import org.mulgara.resolver.spi.ResolverSession;
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicateFactory.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicateFactory.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicateFactory.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -30,9 +30,6 @@
// Java 2 standard packages
import java.util.*;
-// Third party packages
-import org.apache.log4j.Category; // Apache Log4J
-
// Local packages
import org.mulgara.query.ConstraintHaving;
import org.mulgara.query.ConstraintNotOccurs;
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicatePrototype.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicatePrototype.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicatePrototype.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -30,9 +30,6 @@
// Java 2 standard packages
import java.util.*;
-// Third party packages
-import org.apache.log4j.Category; // Apache Log4J
-
// Local packages
import org.mulgara.query.ConstraintHaving;
import org.mulgara.query.TuplesException;
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictionTuples.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictionTuples.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/RestrictionTuples.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -28,7 +28,7 @@
package org.mulgara.store.tuples;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.TuplesException;
@@ -54,7 +54,7 @@
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
class RestrictionTuples extends WrappedTuples {
- private final static Category logger = Category.getInstance(RestrictionTuples.class.getName());
+ private final static Logger logger = Logger.getLogger(RestrictionTuples.class);
protected RestrictPredicate pred;
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/TestTuplesUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/TestTuplesUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/TestTuplesUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Category; // Apache Log4J
+import org.apache.log4j.Logger; // Apache Log4J
import junit.framework.*; // JUnit
// Local packages
@@ -64,8 +64,7 @@
/**
* Logger.
*/
- private Category logger =
- Category.getInstance(TestTuplesUnitTest.class.getName());
+ private static final Logger logger = Logger.getLogger(TestTuplesUnitTest.class);
/**
* Constructs a new test with the given name.
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnboundJoinUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnboundJoinUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnboundJoinUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -29,7 +29,7 @@
// Third party packages
import junit.framework.*; // JUnit
-import org.apache.log4j.Category; // Log4J
+import org.apache.log4j.Logger; // Log4J
// Locally written packages
import org.mulgara.query.TuplesException;
@@ -58,6 +58,11 @@
public class UnboundJoinUnitTest extends TestCase {
/**
+ * Logger.
+ */
+ private static final Logger logger = Logger.getLogger(UnboundJoinUnitTest.class);
+
+ /**
* Description of the Field
*/
final Variable x = new Variable("x");
@@ -88,12 +93,6 @@
final Variable v = new Variable("v");
/**
- * Logger.
- */
- private Category logger =
- Category.getInstance(UnboundJoinUnitTest.class.getName());
-
- /**
* Constructs a new test with the given name.
*
* @param name the name of the test
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnconstrainedTuplesUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnconstrainedTuplesUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnconstrainedTuplesUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import junit.framework.*;
// Log4J
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Test case for {@link UnconstrainedTuplesUnitTest}.
@@ -58,8 +58,7 @@
/**
* Logger.
*/
- private Category logger =
- Category.getInstance(UnconstrainedTuplesUnitTest.class.getName());
+ private static final Logger logger = Logger.getLogger(UnconstrainedTuplesUnitTest.class);
/**
* Constructs a new test with the given name.
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedAppend.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedAppend.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedAppend.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.util.*;
// Log4J
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.TuplesException;
@@ -64,8 +64,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(UnorderedAppend.class.getName());
+ private final static Logger logger = Logger.getLogger(UnorderedAppend.class);
/**
* The propositions to conjoin.
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedAppendUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedAppendUnitTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedAppendUnitTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import junit.framework.*;
// Log4J
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// locally written packages
import org.mulgara.query.Variable;
@@ -62,8 +62,7 @@
* Logger.
*
*/
- private Category logger =
- Category.getInstance(UnorderedAppendUnitTest.class.getName());
+ private static final Logger logger = Logger.getLogger(UnorderedAppendUnitTest.class);
/**
* Constructs a new test with the given name.
Modified: branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedProjection.java
===================================================================
--- branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedProjection.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedProjection.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.util.*;
// Log4J
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.Cursor;
@@ -65,8 +65,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(UnorderedProjection.class.getName());
+ private final static Logger logger = Logger.getLogger(UnorderedProjection.class);
/**
* The proposition to project.
Modified: branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/BlockCacheLine.java
===================================================================
--- branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/BlockCacheLine.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/BlockCacheLine.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -1,6 +1,6 @@
package org.mulgara.store.xa;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import java.io.IOException;
@@ -47,8 +47,7 @@
protected int nextTuple;
protected int tuplesPerBlock;
- private final static Category logger =
- Category.getInstance(BlockCacheLine.class.getName());
+ private final static Logger logger = Logger.getLogger(BlockCacheLine.class);
public BlockCacheLine(BlockFile file,
Modified: branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/CacheLine.java
===================================================================
--- branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/CacheLine.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/CacheLine.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -1,6 +1,6 @@
package org.mulgara.store.xa;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.mulgara.query.TuplesException;
@@ -52,8 +52,7 @@
public abstract void advance() throws TuplesException;
- private final static Category logger =
- Category.getInstance(CacheLine.class.getName());
+ private final static Logger logger = Logger.getLogger(CacheLine.class);
public int getSegmentSize() {
Modified: branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuples.java
===================================================================
--- branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuples.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuples.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -36,7 +36,7 @@
import java.io.File;
import java.io.IOException;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.mulgara.query.Constraint;
import org.mulgara.query.Cursor;
@@ -114,8 +114,7 @@
protected int[] varLookupList;
// Debugging.
- private final static Category logger =
- Category.getInstance(HybridTuples.class.getName());
+ private final static Logger logger = Logger.getLogger(HybridTuples.class);
private Throwable allocated;
private Throwable closed;
Modified: branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuplesTest.java
===================================================================
--- branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuplesTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuplesTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -36,7 +36,7 @@
// Java 2 standard packages
import java.util.*;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages.
import org.mulgara.query.TuplesException;
@@ -73,8 +73,7 @@
private final static int ODD_LOAD_SIZE = 200000;
private final static int BF_SMALL_LOAD_SIZE = 10;
private final static int BF_LARGE_LOAD_SIZE = 100;
- private final static Category logger =
- Category.getInstance(HybridTuplesTest.class.getName());
+ private final static Logger logger = Logger.getLogger(HybridTuplesTest.class);
private final static int WIDTH = 3;
private HybridTuples hybridTuples;
private RowComparator rowComparator;
Modified: branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/MemoryCacheLine.java
===================================================================
--- branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/MemoryCacheLine.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/tuples-hybrid/java/org/mulgara/store/xa/MemoryCacheLine.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -1,6 +1,6 @@
package org.mulgara.store.xa;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.mulgara.query.TuplesException;
import org.mulgara.store.tuples.DenseLongMatrix;
@@ -36,8 +36,7 @@
protected int width;
private long[] pivotTuple;
- private final static Category logger =
- Category.getInstance(MemoryCacheLine.class.getName());
+ private final static Logger logger = Logger.getLogger(MemoryCacheLine.class);
public MemoryCacheLine(DenseLongMatrix buffer, int size) {
Modified: branches/mgr-73/src/jar/util/java/org/mulgara/util/IntFile.java
===================================================================
--- branches/mgr-73/src/jar/util/java/org/mulgara/util/IntFile.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util/java/org/mulgara/util/IntFile.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.nio.channels.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* A file consisting of longs, ints or bytes that can be accessed concurrently
@@ -64,8 +64,7 @@
protected final static long MASK32 = 0xffffffffL;
protected final static ByteOrder byteOrder; // The byte order to use.
- private static Category logger =
- Category.getInstance(IntFile.class.getName());
+ private static final Logger logger = Logger.getLogger(IntFile.class);
static {
String useByteOrderProp = System.getProperty("mulgara.xa.useByteOrder");
Modified: branches/mgr-73/src/jar/util/java/org/mulgara/util/LongToStringMap.java
===================================================================
--- branches/mgr-73/src/jar/util/java/org/mulgara/util/LongToStringMap.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util/java/org/mulgara/util/LongToStringMap.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.io.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.mulgara.util.TempDir;
@@ -58,8 +58,7 @@
public final class LongToStringMap {
/** Logger for this class */
- private static Category logger =
- Category.getInstance(LongToStringMap.class.getName());
+ private static final Logger logger = Logger.getLogger(LongToStringMap.class);
/** File used to store mappings */
private File stringFileName = null;
Modified: branches/mgr-73/src/jar/util/java/org/mulgara/util/MappedIntFile.java
===================================================================
--- branches/mgr-73/src/jar/util/java/org/mulgara/util/MappedIntFile.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util/java/org/mulgara/util/MappedIntFile.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.nio.channels.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* @created 2003-01-09
@@ -55,8 +55,7 @@
*/
public final class MappedIntFile extends IntFile {
- private static Category logger =
- Category.getInstance(MappedIntFile.class.getName());
+ private static final Logger logger = Logger.getLogger(MappedIntFile.class);
private final static long REGION_SIZE_B = 8 * 1024 * 1024;
private final static long REGION_SIZE_I = REGION_SIZE_B / SIZEOF_INT;
Modified: branches/mgr-73/src/jar/util/java/org/mulgara/util/ResultSetMetaDataImpl.java
===================================================================
--- branches/mgr-73/src/jar/util/java/org/mulgara/util/ResultSetMetaDataImpl.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util/java/org/mulgara/util/ResultSetMetaDataImpl.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.io.Serializable;
import java.sql.*;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Log4J
@@ -73,8 +73,7 @@
* Logger.
*
*/
- private static Category logger =
- Category.getInstance(ResultSetMetaDataImpl.class.getName());
+ private static final Logger logger = Logger.getLogger(ResultSetMetaDataImpl.class);
/**
* The names of the columns.
Modified: branches/mgr-73/src/jar/util/java/org/mulgara/util/StringToLongMap.java
===================================================================
--- branches/mgr-73/src/jar/util/java/org/mulgara/util/StringToLongMap.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util/java/org/mulgara/util/StringToLongMap.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.util.LinkedHashMap;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.mulgara.util.TempDir;
@@ -64,8 +64,7 @@
*/
public final class StringToLongMap {
- private static Category logger =
- Category.getInstance(StringToLongMap.class.getName());
+ private static final Logger logger = Logger.getLogger(StringToLongMap.class);
// Hash bucket format (16 bytes):
// [ hash code (4) ][ string offset (4) ]
Modified: branches/mgr-73/src/jar/util/java/org/mulgara/util/TempDir.java
===================================================================
--- branches/mgr-73/src/jar/util/java/org/mulgara/util/TempDir.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util/java/org/mulgara/util/TempDir.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.io.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
@@ -58,8 +58,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(TempDir.class.getName());
+ private final static Logger logger = Logger.getLogger(TempDir.class);
private static final File systemTempDir =
new File(System.getProperty("java.io.tmpdir"));
Modified: branches/mgr-73/src/jar/util/java/org/mulgara/util/TestResultSet.java
===================================================================
--- branches/mgr-73/src/jar/util/java/org/mulgara/util/TestResultSet.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util/java/org/mulgara/util/TestResultSet.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.*;
// third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Log4J
@@ -75,8 +75,7 @@
/**
* Logger.
*/
- private static Category logger =
- Category.getInstance(TestResultSet.class.getName());
+ private static final Logger logger = Logger.getLogger(TestResultSet.class);
/**
* The metadata for this result set.
Modified: branches/mgr-73/src/jar/util/java/org/mulgara/util/TestResultSetTest.java
===================================================================
--- branches/mgr-73/src/jar/util/java/org/mulgara/util/TestResultSetTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util/java/org/mulgara/util/TestResultSetTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.*;
// JUnit
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Log4J
@@ -58,8 +58,7 @@
* Logger. Named after the class.
*
*/
- private Category logger =
- Category.getInstance(TestResultSetTest.class.getName());
+ private static final Logger logger = Logger.getLogger(TestResultSetTest.class);
/**
* Test object.
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AVLFile.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AVLFile.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AVLFile.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.nio.channels.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Local packages
import org.mulgara.util.Constants;
@@ -68,8 +68,7 @@
public final class AVLFile {
/** Logger. */
- private final static Category logger =
- Category.getInstance(AVLFile.class.getName());
+ private final static Logger logger = Logger.getLogger(AVLFile.class);
/** The underlying block file */
private ManagedBlockFile avlBlockFile;
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AVLFileTest.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AVLFileTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AVLFileTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -34,7 +34,7 @@
// Third party packages
import junit.framework.*;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Local packages
import org.mulgara.util.Constants;
@@ -64,8 +64,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(AVLFileTest.class.getName());
+ private final static Logger logger = Logger.getLogger(AVLFileTest.class);
/**
* Description of the Field
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AVLNode.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AVLNode.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AVLNode.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.io.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Local packages
import org.mulgara.util.Constants;
@@ -92,8 +92,7 @@
final static long NULL_NODE = Block.INVALID_BLOCK_ID;
/** The logger. */
- private final static Category logger =
- Category.getInstance(AVLNode.class.getName());
+ private final static Logger logger = Logger.getLogger(AVLNode.class);
/** The most recent phase that this node belongs to. */
private AVLFile.Phase phase;
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AbstractBlockFile.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AbstractBlockFile.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/AbstractBlockFile.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* An abstract class that represents a file which consists of a number of
@@ -67,8 +67,7 @@
public final static ByteOrder byteOrder;
/** The logger. */
- private final static Category logger =
- Category.getInstance(AbstractBlockFile.class.getName());
+ private final static Logger logger = Logger.getLogger(AbstractBlockFile.class);
/** All the open files accessed as block files. */
private static Set openFiles = new HashSet();
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/Block.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/Block.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/Block.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -32,7 +32,7 @@
import java.nio.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Local packages
import org.mulgara.util.Constants;
@@ -63,8 +63,7 @@
public static final long INVALID_BLOCK_ID = -1;
@SuppressWarnings("unused")
- private final static Category logger =
- Category.getInstance(Block.class.getName());
+ private final static Logger logger = Logger.getLogger(Block.class);
/**
* The pool of currently unused blocks. Blocks come from here where possible,
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/BlockFile.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/BlockFile.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/BlockFile.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.nio.channels.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* This interface provides access to files using {@link Block}s of data which are
@@ -224,8 +224,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(IOType.class.getName());
+ private final static Logger logger = Logger.getLogger(IOType.class);
/** Calculate the automatic and default IO types. */
static {
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/BlockFileTest.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/BlockFileTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/BlockFileTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -36,7 +36,7 @@
// Java 2 standard packages
import java.util.*;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Test cases for BlockFile.
@@ -88,8 +88,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(BlockFileTest.class.getName());
+ private final static Logger logger = Logger.getLogger(BlockFileTest.class);
/**
* Description of the Field
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/FreeList.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/FreeList.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/FreeList.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -36,7 +36,7 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.mulgara.util.IntFile;
/**
@@ -66,8 +66,7 @@
public final class FreeList {
/** Logger. */
- private final static Category logger =
- Category.getInstance(FreeList.class.getName());
+ private final static Logger logger = Logger.getLogger(FreeList.class);
/** Flag used to indicate that the runtime is in debug mode. */
private final static boolean DEBUG = false;
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/FreeListTest.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/FreeListTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/FreeListTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -34,7 +34,7 @@
// Third party packages
import junit.framework.*;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Local packages
import org.mulgara.util.Constants;
@@ -73,8 +73,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(FreeListTest.class.getName());
+ private final static Logger logger = Logger.getLogger(FreeListTest.class);
/**
* Description of the Field
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/IOBlockFile.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/IOBlockFile.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/IOBlockFile.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -35,7 +35,7 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* An implementation of BlockFile which uses regular (position/read/write) file
@@ -61,8 +61,7 @@
public final class IOBlockFile extends AbstractBlockFile {
/** Logger. */
- private final static Category logger =
- Category.getInstance(IOBlockFile.class.getName());
+ private final static Logger logger = Logger.getLogger(IOBlockFile.class);
private static final int NOMINAL_ALLOCATION_SIZE = 1048576; // in bytes
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/IOBlockFileTest.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/IOBlockFileTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/IOBlockFileTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -34,7 +34,7 @@
// Third party packages
import junit.framework.*;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.mulgara.util.TempDir;
@@ -64,8 +64,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(IOBlockFileTest.class.getName());
+ private final static Logger logger = Logger.getLogger(IOBlockFileTest.class);
private File file;
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/LockFile.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/LockFile.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/LockFile.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -34,7 +34,7 @@
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* A lock file abstraction.
@@ -61,8 +61,7 @@
/**
* Logger.
*/
- private final static Category logger =
- Category.getInstance(LockFile.class.getName());
+ private final static Logger logger = Logger.getLogger(LockFile.class);
/** The set of lock files that are in use by this JVM. */
private static final Set internalLocks = new HashSet();
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/ManagedBlockFile.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/ManagedBlockFile.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/ManagedBlockFile.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.nio.channels.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* A class that implements efficient copy-on-write semantics for a BlockFile.
@@ -60,8 +60,7 @@
public final class ManagedBlockFile {
/** Logger. */
- private final static Category logger =
- Category.getInstance(ManagedBlockFile.class.getName()); // Logger.
+ private final static Logger logger = Logger.getLogger(ManagedBlockFile.class);
/** File extension for the FreeList file. */
private final static String FREELIST_EXT = "_fl";
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/ManagedBlockFileTest.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/ManagedBlockFileTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/ManagedBlockFileTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -34,7 +34,7 @@
// Third party packages
import junit.framework.*;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Local packages
import org.mulgara.util.Constants;
@@ -115,8 +115,7 @@
* Logger.
*
*/
- private final static Category logger =
- Category.getInstance(ManagedBlockFileTest.class.getName());
+ private final static Logger logger = Logger.getLogger(ManagedBlockFileTest.class);
/**
* Description of the Field
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFile.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFile.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFile.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -33,7 +33,7 @@
import java.nio.channels.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* An implementation of BlockFile which uses memory mapped file IO.
@@ -66,8 +66,7 @@
public final static long REGION_SIZE = 8 * 1024 * 1024;
/** The logger. */
- private final static Category logger =
- Category.getInstance(MappedBlockFile.class.getName());
+ private final static Logger logger = Logger.getLogger(MappedBlockFile.class);
/**
* The system page size. The offset into a file that a mapped region starts
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFileTest.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFileTest.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFileTest.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -34,7 +34,7 @@
// Third party packages
import junit.framework.*;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.mulgara.util.TempDir;
@@ -65,8 +65,7 @@
* Logger.
*
*/
- private final static Category logger =
- Category.getInstance(MappedBlockFileTest.class.getName());
+ private final static Logger logger = Logger.getLogger(MappedBlockFileTest.class);
/**
* Named constructor.
Modified: branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/ObjectPool.java
===================================================================
--- branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/ObjectPool.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/jar/util-xa/java/org/mulgara/store/xa/ObjectPool.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -31,7 +31,7 @@
import java.util.*; // Third party packages
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* A pool of objects to avoid calling constructors unnecessarily.
@@ -94,8 +94,7 @@
public final static int TYPE_S_BLOCK = 0;
/** Logger */
- private final static Category logger =
- Category.getInstance(ObjectPool.class.getName());
+ private final static Logger logger = Logger.getLogger(ObjectPool.class);
/** The next cascaded object pool (the root pool) */
private ObjectPool nextPool;
Modified: branches/mgr-73/src/war/server-http/java/HttpServer.java
===================================================================
--- branches/mgr-73/src/war/server-http/java/HttpServer.java 2008-03-17 08:12:10 UTC (rev 680)
+++ branches/mgr-73/src/war/server-http/java/HttpServer.java 2008-03-17 08:19:01 UTC (rev 681)
@@ -30,7 +30,7 @@
import java.net.*;
// Third party packages
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
// Locally written packages
import org.mulgara.query.*;
@@ -62,8 +62,7 @@
/**
* Logger. This is named after the classname.
*/
- private final static Category logger =
- Category.getInstance(HttpServer.class.getName());
+ private final static Logger logger = Logger.getLogger(HttpServer.class);
//
// Constructor
More information about the Mulgara-svn
mailing list