[Mulgara-svn] r855 - in branches/mgr-61-sparql: . KOWARI-MODIFICATIONS conf jxdata/iTQL/backup_restore lib src/jar src/jar/client-jrdf/java/org/mulgara/client/jrdf/test src/jar/config src/jar/demo-mp3 src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing src/jar/itql/java/org/mulgara/itql src/jar/query src/jar/query/java/org/mulgara/query/filter src/jar/query/java/org/mulgara/query/operation src/jar/resolver/java/org/mulgara/resolver src/jar/server-http src/jar/util/java/org/mulgara/util src/jar/util-xa/java/org/mulgara/store/xa
pag at mulgara.org
pag at mulgara.org
Fri Apr 25 22:51:02 UTC 2008
Author: pag
Date: 2008-04-25 15:50:58 -0700 (Fri, 25 Apr 2008)
New Revision: 855
Added:
branches/mgr-61-sparql/KOWARI-MODIFICATIONS/mods-mulgara-1.2.1.txt
branches/mgr-61-sparql/KOWARI-MODIFICATIONS/mods-mulgara-1.2.txt
branches/mgr-61-sparql/lib/castor-1.2-codegen.jar
branches/mgr-61-sparql/lib/castor-1.2-xml-schema.jar
branches/mgr-61-sparql/lib/castor-1.2-xml.jar
branches/mgr-61-sparql/lib/emory-util-2.1-remote.jar
branches/mgr-61-sparql/lib/velocity-1.5.jar
Removed:
branches/mgr-61-sparql/lib/castor-0.9.3.9-xml.jar
branches/mgr-61-sparql/lib/emory-util.jar
branches/mgr-61-sparql/src/jar/connection/
branches/mgr-61-sparql/src/jar/connector/
Modified:
branches/mgr-61-sparql/.classpath
branches/mgr-61-sparql/LEGAL.txt
branches/mgr-61-sparql/build.properties
branches/mgr-61-sparql/build.xml
branches/mgr-61-sparql/common.properties
branches/mgr-61-sparql/conf/mulgara-config.xml
branches/mgr-61-sparql/conf/mulgara-embedded.xsd
branches/mgr-61-sparql/jxdata/iTQL/backup_restore/test.jxu
branches/mgr-61-sparql/src/jar/client-jrdf/java/org/mulgara/client/jrdf/test/ClientGraphUnitTest.java
branches/mgr-61-sparql/src/jar/config/build.xml
branches/mgr-61-sparql/src/jar/demo-mp3/build.xml
branches/mgr-61-sparql/src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing/Mp3Application.java
branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlAutoInterpreter.java
branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java
branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlSession.java
branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlSessionUI.java
branches/mgr-61-sparql/src/jar/query/build.xml
branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/filter/TestContext.java
branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/Backup.java
branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/DataTx.java
branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/Load.java
branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/Restore.java
branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java
branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java
branches/mgr-61-sparql/src/jar/server-http/build.xml
branches/mgr-61-sparql/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFile.java
branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/AbstractMulgaraResultSet.java
branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/MappedIntFile.java
branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/MulgaraResultSet.java
branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/RowList.java
branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/TestResultSet.java
branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/TestResultSetTest.java
branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/UIDGeneratorUnitTest.java
Log:
Merged and resolved latest trunk: svn merge -r 723:854 http://mulgara.org/svn/mulgara/trunk
Modified: branches/mgr-61-sparql/.classpath
===================================================================
--- branches/mgr-61-sparql/.classpath 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/.classpath 2008-04-25 22:50:58 UTC (rev 855)
@@ -2,12 +2,9 @@
<classpath>
<classpathentry kind="src" path="src/jar/ant-task/java"/>
<classpathentry kind="src" path="src/jar/resolver-distributed/java"/>
- <classpathentry kind="src" path="src/jar/connector/java"/>
<classpathentry kind="src" path="src/war/webui/java"/>
- <classpathentry kind="src" path="src/jar/doclet/java"/>
<classpathentry kind="src" path="src/jar/descriptor/src/java"/>
<classpathentry kind="src" path="src/jar/client-jrdf/java"/>
- <classpathentry kind="src" path="src/jar/connection/java"/>
<classpathentry kind="src" path="src/jar/content-mbox/java"/>
<classpathentry kind="src" path="src/jar/content-mp3/java"/>
<classpathentry kind="src" path="src/jar/content-n3/java"/>
@@ -59,6 +56,7 @@
<classpathentry kind="src" path="src/jar/tuples-hybrid/java"/>
<classpathentry kind="src" path="src/jar/util/java"/>
<classpathentry kind="src" path="src/jar/util-xa/java"/>
+ <classpathentry kind="src" path="src/jar/parser/java"/>
<classpathentry kind="src" path="src/jar/sparql-interpreter/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/xom-1.0d21.jar"/>
@@ -102,12 +100,10 @@
<classpathentry kind="lib" path="lib/jakarta-oro-2.0.5.jar"/>
<classpathentry kind="lib" path="lib/icu4j.jar"/>
<classpathentry kind="lib" path="lib/gnu-regexp-1.1.4.jar"/>
- <classpathentry kind="lib" path="lib/emory-util.jar"/>
<classpathentry kind="lib" path="lib/connector-1_5.jar"/>
<classpathentry kind="lib" path="lib/concurrent-1.3.4.jar"/>
<classpathentry kind="lib" path="lib/commons-logging-1.0.3.jar"/>
<classpathentry kind="lib" path="lib/commons-discovery-1.2.jar"/>
- <classpathentry kind="lib" path="lib/castor-0.9.3.9-xml.jar"/>
<classpathentry kind="lib" path="lib/bsh-2.0b1.jar"/>
<classpathentry kind="lib" path="lib/bsf-2.3.0.jar"/>
<classpathentry kind="lib" path="lib/beepcore-0.9.08.jar"/>
@@ -133,6 +129,12 @@
<classpathentry kind="lib" path="lib/DateUtils1.jar"/>
<classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
+ <classpathentry kind="lib" path="lib/castor-1.2-codegen.jar"/>
+ <classpathentry kind="lib" path="lib/castor-1.2-xml.jar"/>
+ <classpathentry kind="lib" path="lib/castor-1.2-xml-schema.jar"/>
+ <classpathentry kind="lib" path="lib/derby.jar"/>
+ <classpathentry kind="lib" path="lib/velocity-1.5.jar"/>
+ <classpathentry kind="lib" path="lib/emory-util-2.1-remote.jar"/>
<classpathentry kind="lib" path="lib/mulgara-sparql-0.0.1.jar"/>
<classpathentry kind="output" path="obj/jar"/>
</classpath>
Copied: branches/mgr-61-sparql/KOWARI-MODIFICATIONS/mods-mulgara-1.2.1.txt (from rev 854, trunk/KOWARI-MODIFICATIONS/mods-mulgara-1.2.1.txt)
===================================================================
--- branches/mgr-61-sparql/KOWARI-MODIFICATIONS/mods-mulgara-1.2.1.txt (rev 0)
+++ branches/mgr-61-sparql/KOWARI-MODIFICATIONS/mods-mulgara-1.2.1.txt 2008-04-25 22:50:58 UTC (rev 855)
@@ -0,0 +1,39 @@
+------------------------------------------------------------------------
+r737 | pag | 2008-04-04 14:17:57 -0500 (Fri, 04 Apr 2008) | 1 line
+Changed paths:
+ M /trunk/common.properties
+
+Updated for new minor-release version number
+------------------------------------------------------------------------
+r736 | pag | 2008-04-04 07:37:03 -0500 (Fri, 04 Apr 2008) | 1 line
+Changed paths:
+ M /trunk/jxdata/iTQL/backup_restore/test.jxu
+
+added in backup/restore tests
+------------------------------------------------------------------------
+r735 | pag | 2008-04-03 22:59:41 -0500 (Thu, 03 Apr 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/DataTx.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/Load.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java
+
+Changed marshalled data transfer to decompress LOAD files, but to send RESTORE data raw (which is always compressed). LOADS cannot be done compressed, as the Session interface does not allow for a compressed stream.
+------------------------------------------------------------------------
+r734 | pag | 2008-04-03 22:56:34 -0500 (Thu, 03 Apr 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/Backup.java
+
+Had an inverted test on the 'local' flag, so local was backing up on the server and remote was backing up on the client
+------------------------------------------------------------------------
+r733 | pag | 2008-04-03 22:55:15 -0500 (Thu, 03 Apr 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/itql/java/org/mulgara/itql/TqlSession.java
+
+Missed a change in prompt for the first prompt printed (all subsequent prompts were correct)
+------------------------------------------------------------------------
+r732 | pag | 2008-04-03 14:12:03 -0500 (Thu, 03 Apr 2008) | 1 line
+Changed paths:
+ M /trunk/common.properties
+
+Updated the version to be in sync with the release
+------------------------------------------------------------------------
Copied: branches/mgr-61-sparql/KOWARI-MODIFICATIONS/mods-mulgara-1.2.txt (from rev 854, trunk/KOWARI-MODIFICATIONS/mods-mulgara-1.2.txt)
===================================================================
--- branches/mgr-61-sparql/KOWARI-MODIFICATIONS/mods-mulgara-1.2.txt (rev 0)
+++ branches/mgr-61-sparql/KOWARI-MODIFICATIONS/mods-mulgara-1.2.txt 2008-04-25 22:50:58 UTC (rev 855)
@@ -0,0 +1,1065 @@
+------------------------------------------------------------------------
+r722 | pag | 2008-03-28 16:34:45 -0500 (Fri, 28 Mar 2008) | 1 line
+Changed paths:
+ A /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/Handler.java
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiServer.java
+ A /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiURLConnection.java
+
+A new URL handler for the rmi protocol. This allows rmi:// URIs to be created as URLs instead, if desired. The RmiURLConnection also has some useful features for connecting to an RMI server, either to get a description of the service, or to obtain a Remote object reference that can be used directly.
+------------------------------------------------------------------------
+r721 | pag | 2008-03-28 16:32:30 -0500 (Fri, 28 Mar 2008) | 1 line
+Changed paths:
+ A /trunk/src/jar/util/java/org/mulgara/util/ClassDescriber.java
+ A /trunk/src/jar/util/java/org/mulgara/util/ClassDescriberXML.java
+
+An interface and one implementation for creating string descriptions of classes.
+------------------------------------------------------------------------
+r720 | pag | 2008-03-28 16:30:39 -0500 (Fri, 28 Mar 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java
+ M /trunk/src/jar/itql/sablecc/itql.grammar
+ M /trunk/src/jar/query/java/org/mulgara/parser/Interpreter.java
+
+Added command for listing aliases, and added the SKOS and FOAF namespaces into the default alias list. Due to the SableCC change it may be necessary for Eclipse users to rebuild ideSupport.jav
+------------------------------------------------------------------------
+r719 | pag | 2008-03-28 14:05:55 -0500 (Fri, 28 Mar 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerPageImpl.java
+
+Formatting and generics
+------------------------------------------------------------------------
+r718 | pag | 2008-03-27 22:48:15 -0500 (Thu, 27 Mar 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/server/java/org/mulgara/server/AbstractServer.java
+ M /trunk/src/jar/server-beep/java/org/mulgara/server/beep/BEEPServer.java
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiServer.java
+
+Fixed port handling in URIs for servers. Fixed formatting while there.
+------------------------------------------------------------------------
+r717 | pag | 2008-03-26 21:43:41 -0500 (Wed, 26 Mar 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/query/java/org/mulgara/server/Session.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/ApplyRulesOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
+
+Removed the erroneous addition of RemoteException to the applyRules method
+------------------------------------------------------------------------
+r716 | pag | 2008-03-26 21:26:01 -0500 (Wed, 26 Mar 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/krule/build.xml
+ M /trunk/src/jar/krule/java/org/mulgara/krule/KruleLoader.java
+ M /trunk/src/jar/krule/java/org/mulgara/krule/Rule.java
+ M /trunk/src/jar/krule/java/org/mulgara/krule/RuleStructure.java
+ M /trunk/src/jar/query/java/org/mulgara/server/Session.java
+ A /trunk/src/jar/resolver/java/org/mulgara/resolver/ApplyRulesOperation.java
+ A /trunk/src/jar/resolver/java/org/mulgara/resolver/BuildRulesOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/OperationContext.java
+ M /trunk/src/jar/rules/java/org/mulgara/rules/Rules.java
+ M /trunk/src/jar/server-beep/java/org/mulgara/server/beep/BEEPSession.java
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSession.java
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/SessionWrapperRemoteSession.java
+
+Updated Krule to use the new transaction framework, fixing a number of transaction bugs that it had. This needed changes in other systems for visibility, like OperationContext becoming public, and the Session method signatures for rule operations had to be made more consistent with other transactional Operations. Generics were also added to the Session implementations, since these classes were being updated already.
+------------------------------------------------------------------------
+r715 | pag | 2008-03-26 21:20:53 -0500 (Wed, 26 Mar 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/itql/build.xml
+
+Fixed the change in filename of the TQL log4j configuration
+------------------------------------------------------------------------
+r714 | andrae | 2008-03-26 00:49:37 -0500 (Wed, 26 Mar 2008) | 5 lines
+Changed paths:
+ M /trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/TestResolverSession.java
+ M /trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/TestResolverSession.java
+ M /trunk/src/jar/content-n3/java/org/mulgara/content/n3/TestResolverSession.java
+ M /trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/TestResolverSession.java
+ M /trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/writer/TestResolverSession.java
+ M /trunk/src/jar/content-rio/java/org/mulgara/content/rio/TestResolverSession.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/BackupOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/BootstrapOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/CreateModelOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/LoginOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/ModelExistsOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/ModifyModelOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransaction.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/Operation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/PersistentResolverSession.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/PreallocateOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/QueryOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/RemoveModelOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/RestoreOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/SetModelOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/StringPoolSession.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/TestResolverSession.java
+ M /trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/TestResolverSession.java
+ M /trunk/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolver.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/BackupRestoreSession.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ResolverSession.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolver.java
+ M /trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/TestResolverSession.java
+
+refs #89
+
+svn merge -r 712:713 ../branches/mgr-89-backup
+
+
+------------------------------------------------------------------------
+r712 | pag | 2008-03-25 19:37:55 -0500 (Tue, 25 Mar 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/krule/java/org/mulgara/krule/KruleLoader.java
+
+Made rule loading more robust in the face of bad structures, and provided some better error reporting. Also found a typo in a configuration query that would ultimately have affected OWL
+------------------------------------------------------------------------
+r711 | pag | 2008-03-25 15:48:38 -0500 (Tue, 25 Mar 2008) | 1 line
+Changed paths:
+ M /trunk/build.xml
+
+Updated the tql jar config to load the correct log4j file
+------------------------------------------------------------------------
+r710 | andrae | 2008-03-25 04:40:22 -0500 (Tue, 25 Mar 2008) | 17 lines
+Changed paths:
+ M /trunk/jxdata/iTQL/backup_restore/test.jxu
+ M /trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/TestResolverSession.java
+ M /trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/TestResolverSession.java
+ M /trunk/src/jar/content-n3/java/org/mulgara/content/n3/TestResolverSession.java
+ M /trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/TestResolverSession.java
+ M /trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/writer/TestResolverSession.java
+ M /trunk/src/jar/content-rio/java/org/mulgara/content/rio/TestResolverSession.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/BackupOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/PersistentResolverSession.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/StringPoolSession.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/TestResolverSession.java
+ M /trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/TestResolverSession.java
+ M /trunk/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolver.java
+ A /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/BackupRestoreSession.java (from /branches/mgr-89-backup/src/jar/resolver-spi/java/org/mulgara/resolver/spi/BackupRestoreSession.java:709)
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ResolverSession.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolver.java
+ M /trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/TestResolverSession.java
+ M /trunk/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java
+
+refs #89
+
+merge -r 699:709 ../../branches/mgr-89-backup
+
+This merge fixes the problem with backup obtaining the wrong phase.
+
+The core of the fix is in BackupOperation, BackupRestoreSession, and
+StringPoolSession.
+
+As discussed on the wiki - this bug was related to a failure by BackupOperation
+to use the phase provided it by the enclosing transaction, instead bypassing the
+transaction and obtaining its own reference to the current-phase. This is
+clearly in error as this is a read-only operation and so should not require
+access to this phase - and moreover this bypass also bypassed the write-lock,
+meaning the phase was not stable, leading to errors.
+
+
+------------------------------------------------------------------------
+r696 | andrae | 2008-03-19 02:36:01 -0500 (Wed, 19 Mar 2008) | 3 lines
+Changed paths:
+ M /trunk/src/jar/itql/java/org/mulgara/itql/SableCCInterpreter.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/URIUtil.java
+
+Small fix to URIUtil to capture the full URISyntaxExeption.
+
+
+------------------------------------------------------------------------
+r692 | ronald | 2008-03-18 06:07:25 -0500 (Tue, 18 Mar 2008) | 2 lines
+Changed paths:
+ M /trunk/LEGAL.txt
+
+Fixed url for jca jar (copy-paste error).
+
+------------------------------------------------------------------------
+r691 | andrae | 2008-03-18 04:32:14 -0500 (Tue, 18 Mar 2008) | 6 lines
+Changed paths:
+ M /trunk/.classpath
+ M /trunk/LEGAL.txt
+ M /trunk/build.properties
+ M /trunk/build.sh
+ M /trunk/build.xml
+ M /trunk/common.xml
+ A /trunk/docs/site-src/design/JTAInterface.txt (from /branches/mgr-73/docs/site-src/design/JTAInterface.txt:690)
+ M /trunk/jxdata/iTQL/data_types/queryResult34.txt
+ M /trunk/jxdata/iTQL/standard_queries/queryResult17.txt
+ A /trunk/lib/carol-2.0.5.jar (from /branches/mgr-73/lib/carol-2.0.5.jar:690)
+ A /trunk/lib/howl-logger-0.1.11.jar (from /branches/mgr-73/lib/howl-logger-0.1.11.jar:690)
+ D /trunk/lib/jotm-1.5.3-patched.jar
+ A /trunk/lib/jotm-2.0.10.jar (from /branches/mgr-73/lib/jotm-2.0.10.jar:690)
+ D /trunk/lib/jotm_carol-1.5.3.jar
+ D /trunk/lib/jotm_iiop_stubs-1.5.3.jar
+ A /trunk/lib/jotm_jrmp_stubs-2.0.10.jar (from /branches/mgr-73/lib/jotm_jrmp_stubs-2.0.10.jar:690)
+ M /trunk/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/VariableBuilder.java
+ M /trunk/src/jar/krule/java/org/mulgara/krule/QueryStruct.java
+ M /trunk/src/jar/query/java/org/mulgara/query/AggregateFunction.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstantValue.java
+ M /trunk/src/jar/query/java/org/mulgara/query/Query.java
+ M /trunk/src/jar/query/java/org/mulgara/query/QueryUnitTest.java
+ A /trunk/src/jar/query/java/org/mulgara/query/SelectElement.java (from /branches/mgr-73/src/jar/query/java/org/mulgara/query/SelectElement.java:690)
+ M /trunk/src/jar/query/java/org/mulgara/query/Variable.java
+ A /trunk/src/jar/query/java/org/mulgara/server/ResourceManagerInstanceAdaptor.java (from /branches/mgr-73/src/jar/query/java/org/mulgara/server/ResourceManagerInstanceAdaptor.java:690)
+ M /trunk/src/jar/query/java/org/mulgara/server/Session.java
+ M /trunk/src/jar/resolver/build.xml
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/BasicDatabaseSessionUnitTest.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSessionListQueryUnitTest.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSessionUnitTest.java
+ A /trunk/src/jar/resolver/java/org/mulgara/resolver/ExternalTransactionUnitTest.java (from /branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/ExternalTransactionUnitTest.java:690)
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/InternalResolver.java
+ A /trunk/src/jar/resolver/java/org/mulgara/resolver/JotmTransactionStandaloneTest.java (from /branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/JotmTransactionStandaloneTest.java:690)
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/LocalJRDFDatabaseSession.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/ModifyModelOperation.java
+ A /trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransaction.java (from /branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransaction.java:690)
+ A /trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransactionFactory.java (from /branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransactionFactory.java:690)
+ A /trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java (from /branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java:690)
+ A /trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java (from /branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java:690)
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java
+ A /trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java (from /branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java:690)
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java
+ A /trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraXAResourceContext.java (from /branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraXAResourceContext.java:690)
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/XADatabaseSessionUnitTest.java
+ M /trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/NetworkDelegator.java
+ M /trunk/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolver.java
+ M /trunk/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolverFactory.java
+ M /trunk/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryXAResource.java
+ A /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java (from /branches/mgr-73/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java:690)
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/DummyXAResource.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TripleSetWrapperStatements.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolver.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolverFactory.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreXAResource.java
+ M /trunk/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverUnitTest.java
+ M /trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverUnitTest.java
+ M /trunk/src/jar/server-beep/java/org/mulgara/server/beep/BEEPSession.java
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSession.java
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java
+ A /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteXAResource.java (from /branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteXAResource.java:690)
+ A /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteXAResourceWrapperXAResource.java (from /branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteXAResourceWrapperXAResource.java:690)
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/SessionWrapperRemoteSession.java
+ A /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/XAResourceWrapperRemoteXAResource.java (from /branches/mgr-73/src/jar/server-rmi/java/org/mulgara/server/rmi/XAResourceWrapperRemoteXAResource.java:690)
+ A /trunk/src/jar/util/java/org/mulgara/util/Assoc1toNMap.java (from /branches/mgr-73/src/jar/util/java/org/mulgara/util/Assoc1toNMap.java:690)
+
+refs #73
+refs #85
+
+Final merge of the JTA development into trunk.
+
+
+------------------------------------------------------------------------
+r689 | andrae | 2008-03-17 23:32:14 -0500 (Mon, 17 Mar 2008) | 3 lines
+Changed paths:
+ M /trunk/src/jar/query/java/org/mulgara/query/AbstractConstraintExpression.java
+ M /trunk/src/jar/query/java/org/mulgara/query/Constraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintExpression.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintFalse.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintHaving.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintImpl.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintIs.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintNegation.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintTrue.java
+ M /trunk/src/jar/query/java/org/mulgara/query/GivenConstraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/LocalNode.java
+ M /trunk/src/jar/query/java/org/mulgara/query/SingleTransitiveConstraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/TransitiveConstraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/WalkConstraint.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/CacheResolver.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/ConstraintOperations.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DirectTransitiveFunction.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/LocalQueryResolver.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/WalkFunction.java
+ M /trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemResolver.java
+ M /trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolver.java
+ M /trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolver.java
+ M /trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolver.java
+ M /trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/TuplesWrapperResolution.java
+ M /trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraint.java
+ M /trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolver.java
+ M /trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalTransformer.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/content/ContentResolver.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ConjunctiveTransformer.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ConjunctiveTransformerUnitTest.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreDuplicateResolution.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreInverseResolution.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolution.java
+ M /trunk/src/jar/resolver-test/java/org/mulgara/resolver/test/TestConstraint.java
+ M /trunk/src/jar/resolver-url/java/org/mulgara/resolver/url/URLResolver.java
+ M /trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolver.java
+ M /trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraint.java
+ M /trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalTransformation.java
+ M /trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolver.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/ConstrainedNegationTuples.java
+
+Reverted checkin of filter code that wasn't intended for trunk/
+
+
+------------------------------------------------------------------------
+r683 | pag | 2008-03-17 15:25:39 -0500 (Mon, 17 Mar 2008) | 1 line
+Changed paths:
+ M /branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java
+ A /branches/mgr-61-sparql/src/jar/sparql
+ M /trunk/src/jar/query/java/org/mulgara/query/AbstractConstraintExpression.java
+ M /trunk/src/jar/query/java/org/mulgara/query/Constraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintExpression.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintFalse.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintHaving.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintImpl.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintIs.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintNegation.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintTrue.java
+ M /trunk/src/jar/query/java/org/mulgara/query/GivenConstraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/LocalNode.java
+ M /trunk/src/jar/query/java/org/mulgara/query/SingleTransitiveConstraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/TransitiveConstraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/WalkConstraint.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/CacheResolver.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/ConstraintOperations.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DirectTransitiveFunction.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/LocalQueryResolver.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/WalkFunction.java
+ M /trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemResolver.java
+ M /trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolver.java
+ M /trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolver.java
+ M /trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolver.java
+ M /trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/TuplesWrapperResolution.java
+ M /trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraint.java
+ M /trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolver.java
+ M /trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalTransformer.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/content/ContentResolver.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ConjunctiveTransformer.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ConjunctiveTransformerUnitTest.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreDuplicateResolution.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreInverseResolution.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolution.java
+ M /trunk/src/jar/resolver-test/java/org/mulgara/resolver/test/TestConstraint.java
+ M /trunk/src/jar/resolver-url/java/org/mulgara/resolver/url/URLResolver.java
+ M /trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolver.java
+ M /trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraint.java
+ M /trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalTransformation.java
+ M /trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolver.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/ConstrainedNegationTuples.java
+
+Initial checkin of filter code. Currently compiling
+------------------------------------------------------------------------
+r677 | ronald | 2008-03-12 02:17:57 -0500 (Wed, 12 Mar 2008) | 6 lines
+Changed paths:
+ A /trunk/jxdata/iTQL/parser
+ A /trunk/jxdata/iTQL/parser/createResult.txt
+ A /trunk/jxdata/iTQL/parser/dropResult.txt
+ A /trunk/jxdata/iTQL/parser/insertResult1.txt
+ A /trunk/jxdata/iTQL/parser/insertResult2.txt
+ A /trunk/jxdata/iTQL/parser/insertResult3.txt
+ A /trunk/jxdata/iTQL/parser/test.jxu
+ M /trunk/src/jar/itql/sablecc/itql.grammar
+
+Fix #72: an emtpy <> in an iTQL statements would get ignored and treated
+as whitespace, leading to somewhat unexpected results. This fix adjusts
+the lexer to require at least one urlchar between the < and >. A better,
+but more complicated, fix would probably be to handle this in the parser,
+but this does the trick and gives a usable error message.
+
+------------------------------------------------------------------------
+r676 | ronald | 2008-03-10 07:17:15 -0500 (Mon, 10 Mar 2008) | 3 lines
+Changed paths:
+ M /trunk/src/jar/client-jrdf/java/org/mulgara/client/jrdf/test/ClientGraphUnitTest.java
+ M /trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing/Mp3Application.java
+ M /trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/PIErrorHandler.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/CollaboratorUnitTest.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/HelpPrinter.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/ItqlOptionParser.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/ItqlSession.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/TqlSession.java
+ M /trunk/src/jar/query/java/org/mulgara/query/AnswerImpl.java
+ M /trunk/src/jar/query/java/org/mulgara/query/AnswerOperations.java
+ M /trunk/src/jar/query/java/org/mulgara/query/AnswerOperationsUnitTest.java
+ M /trunk/src/jar/query/java/org/mulgara/query/AnswerUnitTest.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintHaving.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintImpl.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintIs.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintNotOccurs.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintOccurs.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintOccursLessThan.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintOccursMoreThan.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintOperation.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ModelLiteral.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ModelPartition.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ModelResourceUnitTest.java
+ M /trunk/src/jar/query/java/org/mulgara/query/QueryUnitTest.java
+ M /trunk/src/jar/query/java/org/mulgara/query/SingleTransitiveConstraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/TransitiveConstraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/UnconstrainedAnswer.java
+ M /trunk/src/jar/query/java/org/mulgara/query/WalkConstraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/rdf/LiteralImplUnitTest.java
+ M /trunk/src/jar/rdql/java/org/mulgara/rdql/RdqlOptionParser.java
+ M /trunk/src/jar/rdql/java/org/mulgara/rdql/RdqlSession.java
+ M /trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreDuplicateResolution.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreInverseResolution.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolution.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFileUnitTest.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleWriteThread.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa/XAStatementStoreImpl.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa/XAStatementStoreImplUnitTest.java
+ M /trunk/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverUnitTest.java
+ M /trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraOptionParser.java
+ M /trunk/src/jar/server-beep/java/org/mulgara/server/beep/BEEPAnswer.java
+ M /trunk/src/jar/server-beep/java/org/mulgara/server/beep/BEEPSession.java
+ M /trunk/src/jar/server-beep/java/org/mulgara/server/beep/CommandProfile.java
+ M /trunk/src/jar/server-beep/java/org/mulgara/server/beep/CommandRequestHandler.java
+ M /trunk/src/jar/server-beep/java/org/mulgara/server/beep/QueryProfile.java
+ M /trunk/src/jar/server-beep/java/org/mulgara/server/beep/QueryRequestHandler.java
+ M /trunk/src/jar/server-http/java/org/mulgara/server/http/HttpSessionFactory.java
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerPageImplUnitTest.java
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerWrapperRemoteAnswerSerialised.java
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/PagedRemoteAnswer.java
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteAnswer.java
+ M /trunk/src/jar/sparql-protocol/java/org/mulgara/sparql/protocol/StreamAnswerTest.java
+ M /trunk/src/jar/store-nodepool-xa/java/org/mulgara/store/nodepool/xa/XANodePoolImpl.java
+ M /trunk/src/jar/store-nodepool-xa/java/org/mulgara/store/nodepool/xa/XANodePoolImplTest.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPObject.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPStringComparator.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPTypedLiteral.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/StringPoolAbstractTest.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBase64BinaryImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBinaryComparator.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPBooleanImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPCaseInsensitiveStringComparator.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPCaseSensitiveStringComparator.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPFloatImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGDayImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthDayImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGMonthImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPGYearMonthImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPHexBinaryImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPObjectFactoryImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPStringImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPTypedLiteralRegistry.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPURIImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXMLLiteralImpl.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringFactory.java
+ M /trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPXSDStringImpl.java
+ M /trunk/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java
+ M /trunk/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImplTest.java
+ M /trunk/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImpl.java
+ M /trunk/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImplTest.java
+ M /trunk/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolLoadTest.java
+ M /trunk/src/jar/store-xa/java/org/mulgara/store/xa/SimpleXAResourceException.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/ConstrainedNegationTuples.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/DefaultRowComparator.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/DenseLongMatrix.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/DifferenceUnitTest.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/DistinctTuples.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/DistinctTuplesUnitTest.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/HavingPredicates.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/JoinTuples.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/LimitedTuples.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/LiteralTuplesUnitTest.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/OffsetTuples.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/OrderedProjection.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/OrderedProjectionUnitTest.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicate.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicateFactory.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/RestrictPredicatePrototype.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/RestrictionTuples.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/TestTuplesUnitTest.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/UnboundJoinUnitTest.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/UnconstrainedTuplesUnitTest.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedAppend.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedAppendUnitTest.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedProjection.java
+ M /trunk/src/jar/tuples-hybrid/java/org/mulgara/store/xa/BlockCacheLine.java
+ M /trunk/src/jar/tuples-hybrid/java/org/mulgara/store/xa/CacheLine.java
+ M /trunk/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuples.java
+ M /trunk/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuplesTest.java
+ M /trunk/src/jar/tuples-hybrid/java/org/mulgara/store/xa/MemoryCacheLine.java
+ M /trunk/src/jar/util/java/org/mulgara/util/IntFile.java
+ M /trunk/src/jar/util/java/org/mulgara/util/LongToStringMap.java
+ M /trunk/src/jar/util/java/org/mulgara/util/MappedIntFile.java
+ M /trunk/src/jar/util/java/org/mulgara/util/ResultSetMetaDataImpl.java
+ M /trunk/src/jar/util/java/org/mulgara/util/StringToLongMap.java
+ M /trunk/src/jar/util/java/org/mulgara/util/TempDir.java
+ M /trunk/src/jar/util/java/org/mulgara/util/TestResultSet.java
+ M /trunk/src/jar/util/java/org/mulgara/util/TestResultSetTest.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/AVLFile.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/AVLFileTest.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/AVLNode.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/AbstractBlockFile.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/Block.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/BlockFile.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/BlockFileTest.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/FreeList.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/FreeListTest.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/IOBlockFile.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/IOBlockFileTest.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/LockFile.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/ManagedBlockFile.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/ManagedBlockFileTest.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFile.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFileTest.java
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/ObjectPool.java
+ M /trunk/src/war/server-http/java/HttpServer.java
+
+Replaced all log4j Category's with Logger's as Category is deprecated.
+Also ensured all 'logger' fields are static and final.
+
+------------------------------------------------------------------------
+r675 | ronald | 2008-03-10 07:10:02 -0500 (Mon, 10 Mar 2008) | 2 lines
+Changed paths:
+ M /trunk/common.xml
+
+Replaced another custom javascript script with standard ant tasks.
+
+------------------------------------------------------------------------
+r674 | ronald | 2008-03-09 20:43:32 -0500 (Sun, 09 Mar 2008) | 2 lines
+Changed paths:
+ M /trunk/build.xml
+
+Fail build if any test failed.
+
+------------------------------------------------------------------------
+r673 | ronald | 2008-03-09 20:42:24 -0500 (Sun, 09 Mar 2008) | 2 lines
+Changed paths:
+ M /trunk/build.xml
+
+Replace custom javascript to copy a file to stdout with a standard ant task.
+
+------------------------------------------------------------------------
+r671 | andrae | 2008-03-07 12:16:37 -0600 (Fri, 07 Mar 2008) | 9 lines
+Changed paths:
+ D /trunk/jxdata/iTQL/exclude_queries
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java
+
+Removed support for exclude() constraint.
+
+If you think you need this, you don't - talk to us about how you actually want
+to be using minus instead.
+
+This has been done by commenting out the relevant constraint handler, so there
+remains some cleanup to be done.
+
+
+------------------------------------------------------------------------
+r668 | pag | 2008-03-04 15:06:47 -0600 (Tue, 04 Mar 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/ForeignBlankNode.java
+
+Returned shift value to 32 bits like it was supposed to be
+------------------------------------------------------------------------
+r667 | pag | 2008-03-03 09:37:28 -0600 (Mon, 03 Mar 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/ForeignBlankNode.java
+
+Fixed the hashcode and text representation of blank nodes from another server
+------------------------------------------------------------------------
+r666 | pag | 2008-03-03 09:36:31 -0600 (Mon, 03 Mar 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/content-n3/java/org/mulgara/content/n3/Parser.java
+
+Fixed blank node allocation to not allocate a node when selecting from an N3 resolver and not loading data
+------------------------------------------------------------------------
+r665 | pag | 2008-03-03 09:33:13 -0600 (Mon, 03 Mar 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java
+
+added testInsertionBlankNodes - contributed by Alex Hall
+------------------------------------------------------------------------
+r664 | pag | 2008-03-03 09:31:33 -0600 (Mon, 03 Mar 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/StringPoolSession.java
+
+Removed blank node cache, to allow caching to happen at another level. Reformatted text.
+------------------------------------------------------------------------
+r662 | pag | 2008-02-26 16:02:35 -0600 (Tue, 26 Feb 2008) | 1 line
+Changed paths:
+ M /trunk/.classpath
+
+Updated Eclipse classpath for libs updated in r661
+------------------------------------------------------------------------
+r661 | ronald | 2008-02-26 04:07:28 -0600 (Tue, 26 Feb 2008) | 2 lines
+Changed paths:
+ M /trunk/LEGAL.txt
+ M /trunk/build.properties
+ M /trunk/common.xml
+ D /trunk/lib/axis-1.1.jar
+ A /trunk/lib/axis-1.4.jar (from /trunk/lib/axis-1.1.jar:659)
+ D /trunk/lib/axis-ant-1.1.jar
+ A /trunk/lib/axis-ant-1.4.jar (from /trunk/lib/axis-ant-1.1.jar:659)
+ D /trunk/lib/jaxrpc-1.1.jar
+ A /trunk/lib/jaxrpc-1.4.jar (from /trunk/lib/jaxrpc-1.1.jar:659)
+ D /trunk/lib/saaj-1.1.jar
+ A /trunk/lib/saaj-1.4.jar (from /trunk/lib/saaj-1.1.jar:659)
+ D /trunk/lib/wsdl4j-1.4.jar
+ A /trunk/lib/wsdl4j-1.5.1.jar (from /trunk/lib/wsdl4j-1.4.jar:659)
+ M /trunk/src/war/web-services/WEB-INF/server-config.wsdd
+
+Upgrade axis and associated jars to version 1.4 (the latest in the 1.x series).
+
+------------------------------------------------------------------------
+r660 | ronald | 2008-02-26 01:58:34 -0600 (Tue, 26 Feb 2008) | 2 lines
+Changed paths:
+ M /trunk/LEGAL.txt
+
+log4j update (should've been part of [644]).
+
+------------------------------------------------------------------------
+r659 | pag | 2008-02-26 00:18:06 -0600 (Tue, 26 Feb 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/CreateModelOperation.java
+
+Less vigorous testing of graph URIs, permitting non-URLs to be used as graph URIs
+------------------------------------------------------------------------
+r658 | pag | 2008-02-25 23:34:43 -0600 (Mon, 25 Feb 2008) | 1 line
+Changed paths:
+ M /trunk/jxdata/iTQL/backup_restore/backup1Result3.txt
+ M /trunk/jxdata/iTQL/backup_restore/result3.txt
+ M /trunk/jxdata/iTQL/create_drop/queryResult3.txt
+ M /trunk/jxdata/iTQL/create_drop/queryResult5.txt
+ M /trunk/jxdata/iTQL/data_types/binary/base64Binary/result1.txt
+ M /trunk/jxdata/iTQL/data_types/binary/hexBinary/result1.txt
+ M /trunk/jxdata/iTQL/data_types/boolean/result1.txt
+ M /trunk/jxdata/iTQL/data_types/gDates/result1.txt
+ M /trunk/jxdata/iTQL/data_types/queryResult37.txt
+ M /trunk/jxdata/iTQL/data_types/result1.txt
+ M /trunk/jxdata/iTQL/filesystem/queryResult10.txt
+ M /trunk/jxdata/iTQL/filesystem/queryResult11.txt
+ M /trunk/jxdata/iTQL/filesystem/queryResult12.txt
+ M /trunk/jxdata/iTQL/filesystem/queryResult8.txt
+ M /trunk/jxdata/iTQL/filesystem/queryResult9.txt
+ M /trunk/jxdata/iTQL/filesystem/result1.txt
+ M /trunk/jxdata/iTQL/fulltext_queries/drop1.txt
+ M /trunk/jxdata/iTQL/fulltext_queries/queryResult8.txt
+ M /trunk/jxdata/iTQL/fulltext_queries/result2.txt
+ M /trunk/jxdata/iTQL/fulltext_queries/result3.txt
+ M /trunk/jxdata/iTQL/fulltext_queries/result5.txt
+ M /trunk/jxdata/iTQL/fulltext_queries/result7.txt
+ M /trunk/jxdata/iTQL/insert/queryResult1.txt
+ M /trunk/jxdata/iTQL/node_types/result1.txt
+ M /trunk/jxdata/iTQL/prefix/result1.txt
+ M /trunk/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/configResult.txt
+ M /trunk/jxdata/iTQL/rdfs/rdfs-domain-and-range/configResult.txt
+ M /trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/configResult.txt
+ M /trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/configResult.txt
+ M /trunk/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/configResult.txt
+ M /trunk/jxdata/iTQL/rdfs/statement-entailment/configResult.txt
+ M /trunk/jxdata/iTQL/transactions/queryResult6.txt
+ M /trunk/jxdata/iTQL/transactions/queryResult7.txt
+ M /trunk/jxdata/iTQL/transactions/queryResult8.txt
+ M /trunk/jxdata/iTQL/transactions/queryResult9.txt
+ M /trunk/src/jar/ant-task/java/org/mulgara/ant/task/rdf/RDFLoad.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/Collaborator.java
+ A /trunk/src/jar/query/java/org/mulgara/connection/CommandExecutor.java
+ M /trunk/src/jar/query/java/org/mulgara/connection/Connection.java
+ M /trunk/src/jar/query/java/org/mulgara/connection/DummyConnection.java
+ M /trunk/src/jar/query/java/org/mulgara/connection/SessionConnection.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/AddAlias.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/Deletion.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/DropGraph.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/Help.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/Insertion.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/Load.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/NullOp.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/Quit.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/SetTime.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/SetUser.java
+
+Added new interface for calling execute on Connections, passing in Commands. Also changed some messages from model to graph, necessitating changes to the script files and some tests
+------------------------------------------------------------------------
+r656 | ronald | 2008-02-24 06:44:58 -0600 (Sun, 24 Feb 2008) | 4 lines
+Changed paths:
+ M /trunk/common.properties
+ M /trunk/common.xml
+
+Allow additional arguments to be passed to the server started for the tests.
+This allows, for instance, the ports the server listens on to be changed in
+order to avoid conflicts with other apps already running on the same machine.
+
+------------------------------------------------------------------------
+r644 | ronald | 2008-02-18 05:14:23 -0600 (Mon, 18 Feb 2008) | 6 lines
+Changed paths:
+ M /trunk/build.properties
+ M /trunk/build.xml
+ M /trunk/common.properties
+ M /trunk/common.xml
+ A /trunk/lib/log4j-1.2.15.jar (from /trunk/lib/log4j-1.2.8.jar:630)
+ D /trunk/lib/log4j-1.2.8.jar
+ M /trunk/src/jar/itql/build.xml
+ M /trunk/src/jar/rdql/build.xml
+ M /trunk/src/jar/server-http/build.xml
+
+Moved to latest log4j which besides many bugfixes has a TRACE level too.
+
+Needed to bump the memory for tests a bit because (at least on 64-bit jvm's)
+we were running close to the limit and the new log4j just pushed us over it
+during the jxunit tests (30M extra would've been enough, but gave 128M more).
+
+------------------------------------------------------------------------
+r643 | ronald | 2008-02-18 05:00:45 -0600 (Mon, 18 Feb 2008) | 2 lines
+Changed paths:
+ M /trunk/webdocs.xml
+
+Added uptodate checking because the replace operations take a while to run.
+
+------------------------------------------------------------------------
+r642 | ronald | 2008-02-18 04:59:31 -0600 (Mon, 18 Feb 2008) | 3 lines
+Changed paths:
+ M /trunk/src/jar/config/build.xml
+
+Fix uptodate checking: the uptodate check target was never called, and hence
+the uptodate variable was never being set.
+
+------------------------------------------------------------------------
+r638 | ronald | 2008-02-11 01:38:03 -0600 (Mon, 11 Feb 2008) | 2 lines
+Changed paths:
+ M /trunk/lib/antlr.jar
+
+Upgrade antrl to latest 2.x series version, namely 2.7.7.
+
+------------------------------------------------------------------------
+r637 | ronald | 2008-02-11 01:36:45 -0600 (Mon, 11 Feb 2008) | 2 lines
+Changed paths:
+ M /trunk/build.xml
+
+Remove testDatabase and sqltest directories on a 'clean' too.
+
+------------------------------------------------------------------------
+r636 | ronald | 2008-02-11 01:36:07 -0600 (Mon, 11 Feb 2008) | 14 lines
+Changed paths:
+ M /trunk/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBean.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java
+
+Fix legacy-session use: don't invoke setAutoCommit, commit, or rollback on
+the legacy-session, but let the interpreter object and its connections take
+care of that. Otherwise, if the legacy-session is local: then the operations
+will be done twice on the same session leading to errors on commit and
+rollback; if the legacy-session is rmi: then the app will hang on the first
+server-operation because interpreter uses a separate session from the
+legacy-session and hence the setAutoCommit(false) will block.
+
+There is still a problem in that the legacy-session will only be used properly
+if it's a local: session, because if it's an rmi: session then the
+legacy-session will get cached in the connection-factory without an associated
+server-uri but the server-commands will look up the session by the uri and
+hence will get a new session.
+
+------------------------------------------------------------------------
+r635 | ronald | 2008-02-11 01:25:02 -0600 (Mon, 11 Feb 2008) | 2 lines
+Changed paths:
+ M /trunk/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBean.java
+
+Javadoc fixes.
+
+------------------------------------------------------------------------
+r634 | ronald | 2008-02-11 01:20:23 -0600 (Mon, 11 Feb 2008) | 3 lines
+Changed paths:
+ M /trunk/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBean.java
+
+Renamed getLastException() back to getLastError() for compatibility with
+previous releases.
+
+------------------------------------------------------------------------
+r632 | ronald | 2008-02-11 01:16:53 -0600 (Mon, 11 Feb 2008) | 3 lines
+Changed paths:
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/Backup.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/Command.java
+ M /trunk/src/jar/query/java/org/mulgara/query/operation/LocalCommand.java
+
+Removed UnsupportedOperationException throws from getServerURI() as local
+commands return null instead, and updated javadocs accordingly.
+
+------------------------------------------------------------------------
+r631 | ronald | 2008-02-11 01:09:57 -0600 (Mon, 11 Feb 2008) | 3 lines
+Changed paths:
+ M /trunk/src/jar/query/java/org/mulgara/query/ModelResource.java
+
+Recognize "local:" uri's as valid too so connections to local:... can be
+used.
+
+------------------------------------------------------------------------
+r629 | pag | 2008-01-24 16:50:07 -0600 (Thu, 24 Jan 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImpl.java
+
+Updated loadSPObject to avoid an unneccessary copy operation on data from a Block. More of these may be possible
+------------------------------------------------------------------------
+r628 | pag | 2008-01-24 16:47:57 -0600 (Thu, 24 Jan 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/Block.java
+
+Supressed warning, fixed some formatting, and simplified the limit calculation for get(int,ByteBuffer). Added getSlice(int,int) to avoid a copy operation that isn't needed in XAStringPoolImpl
+------------------------------------------------------------------------
+r627 | pag | 2008-01-24 16:42:41 -0600 (Thu, 24 Jan 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpContentUnitTest.java
+
+Updated to reflect changes to http://purl.org/dc/elements/1.1
+------------------------------------------------------------------------
+r626 | pag | 2008-01-24 16:42:09 -0600 (Thu, 24 Jan 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java
+
+Updated to reflect changes to http://purl.org/dc/elements/1.1
+------------------------------------------------------------------------
+r620 | isidhu | 2008-01-04 15:51:34 -0600 (Fri, 04 Jan 2008) | 1 line
+Changed paths:
+ M /trunk/src/jar/util-xa/java/org/mulgara/store/xa/Block.java
+
+modified get(int, ByteBuffer) to do bulk copy between source and destination buffers
+------------------------------------------------------------------------
+r592 | andrae | 2007-12-03 00:32:13 -0600 (Mon, 03 Dec 2007) | 8 lines
+Changed paths:
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionFactoryImpl.java
+
+Removed delgation of close() from RemoteSessionFactory to Database.
+
+Closing a single users proxy providing access to DatabaseSession's should not
+close the Database itself. The result was that after a call to
+RemoteSessionFactory.close() all subsequent attempts to use the mulgara instance
+would fail with a "Stringpool closed" error.
+
+
+------------------------------------------------------------------------
+r585 | pag | 2007-11-28 10:41:25 -0600 (Wed, 28 Nov 2007) | 1 line
+Changed paths:
+ M /trunk/.classpath
+ M /trunk/build.properties
+ M /trunk/build.xml
+ D /trunk/conf/log4j-itql.xml
+ A /trunk/conf/log4j-tql.xml (from /branches/nw-interface/conf/log4j-tql.xml:580)
+ M /trunk/docs/site-src/system/itqlbean.html
+ M /trunk/jxdata/iTQL/data_types/queryResult34.txt
+ M /trunk/jxdata/iTQL/fulltext_queries/drop1.txt
+ M /trunk/jxdata/iTQL/fulltext_queries/test.jxu
+ M /trunk/jxdata/iTQL/having_queries/queryResult10.txt
+ M /trunk/jxdata/iTQL/having_queries/queryResult15-2.txt
+ M /trunk/jxdata/iTQL/having_queries/queryResult15.txt
+ M /trunk/jxdata/iTQL/standard_queries/queryResult17.txt
+ M /trunk/jxdata/iTQL/standard_queries/queryResult18.txt
+ M /trunk/jxdata/iTQL/standard_queries/queryResult19.txt
+ M /trunk/jxdata/iTQL/standard_queries/queryResult3.txt
+ M /trunk/jxdata/iTQL/standard_queries/queryResult4.txt
+ M /trunk/jxdata/iTQL/transitive/result13.txt
+ M /trunk/jxdata/iTQL/transitive/result14.txt
+ M /trunk/jxdata/iTQL/walk/queryResult7.txt
+ M /trunk/src/jar/ant-task/java/org/mulgara/ant/task/itql/ITQLCommand.java
+ M /trunk/src/jar/ant-task/java/org/mulgara/ant/task/itql/ITQLCommandUnitTest.java
+ M /trunk/src/jar/ant-task/java/org/mulgara/ant/task/rdf/RDFLoad.java
+ M /trunk/src/jar/ant-task/java/org/mulgara/ant/task/rdf/RDFLoadLog.java
+ M /trunk/src/jar/ant-task/java/org/mulgara/ant/task/rdf/RDFLoadUnitTest.java
+ M /trunk/src/jar/client-jrdf/java/org/mulgara/client/jrdf/test/ClientGraphUnitTest.java
+ M /trunk/src/jar/client-jrdf/java/org/mulgara/client/jrdf/util/ItqlQueryUtil.java
+ M /trunk/src/jar/config/build.xml
+ M /trunk/src/jar/connection/build.xml
+ D /trunk/src/jar/connection/java/org/mulgara/connection/DefaultItqlConnection.java
+ D /trunk/src/jar/connection/java/org/mulgara/connection/DefaultItqlConnectionUnitTest.java
+ D /trunk/src/jar/connection/java/org/mulgara/connection/InvalidQuerySyntaxException.java
+ D /trunk/src/jar/connection/java/org/mulgara/connection/ItqlConnection.java
+ D /trunk/src/jar/connection/java/org/mulgara/connection/ItqlQueryBuilder.java
+ D /trunk/src/jar/connection/java/org/mulgara/connection/ItqlQueryBuilderUnitTest.java
+ D /trunk/src/jar/connection/java/org/mulgara/connection/MockBadSession.java
+ D /trunk/src/jar/connection/java/org/mulgara/connection/MulgaraConnection.java
+ D /trunk/src/jar/connection/java/org/mulgara/connection/MulgaraConnectionException.java
+ D /trunk/src/jar/connection/java/org/mulgara/connection/MulgaraConnectionFactory.java
+ D /trunk/src/jar/connection/java/org/mulgara/connection/MulgaraConnectionFactoryUnitTest.java
+ D /trunk/src/jar/connection/java/org/mulgara/connection/QueryBuilder.java
+ D /trunk/src/jar/connection/java/org/mulgara/connection/param
+ M /trunk/src/jar/driver/java/org/mulgara/server/driver/SessionFactoryFinder.java
+ M /trunk/src/jar/itql/build.xml
+ A /trunk/src/jar/itql/java/org/mulgara/itql/Aliasing.java (from /branches/nw-interface/src/jar/itql/java/org/mulgara/itql/Aliasing.java:580)
+ M /trunk/src/jar/itql/java/org/mulgara/itql/Collaborator.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/CollaboratorUnitTest.java
+ A /trunk/src/jar/itql/java/org/mulgara/itql/CommandSplitter.java (from /branches/nw-interface/src/jar/itql/java/org/mulgara/itql/CommandSplitter.java:580)
+ M /trunk/src/jar/itql/java/org/mulgara/itql/CompoundPredListBuilder.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/CompoundPredicate.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/ConstraintExpressionBuilder.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/HelpPrinter.java
+ D /trunk/src/jar/itql/java/org/mulgara/itql/ItqlInterpreter.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBean.java
+ M /trunk/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java
+ D /trunk/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterUnitTest.java
+ A /trunk/src/jar/itql/java/org/mulgara/itql/ItqlUtil.java (from /branches/nw-interface/src/jar/itql/java/org/mulgara/itql/ItqlUtil.java:580)
+ M /trunk/src/jar/itql/java/org/mulgara/itql/ModelExpressionBuilder.java
+ A /trunk/src/jar/itql/java/org/mulgara/itql/SableCCInterpreter.java (from /branches/nw-interface/src/jar/itql/java/org/mulgara/itql/SableCCInterpreter.java:580)
+ A /trunk/src/jar/itql/java/org/mulgara/itql/TqlAutoInterpreter.java (from /branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlAutoInterpreter.java:580)
+ A /trunk/src/jar/itql/java/org/mulgara/itql/TqlCommandSplitter.java (from /branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlCommandSplitter.java:580)
+ A /trunk/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java (from /branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java:580)
+ A /trunk/src/jar/itql/java/org/mulgara/itql/TqlSession.java (from /branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlSession.java:580)
+ A /trunk/src/jar/itql/java/org/mulgara/itql/TqlSessionUI.java (from /branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlSessionUI.java:580)
+ A /trunk/src/jar/itql/java/org/mulgara/itql/URIUtil.java (from /branches/nw-interface/src/jar/itql/java/org/mulgara/itql/URIUtil.java:580)
+ M /trunk/src/jar/itql/java/org/mulgara/itql/VariableBuilder.java
+ M /trunk/src/jar/itql/sablecc/itql.grammar
+ M /trunk/src/jar/jrdf/java/org/mulgara/jrdf/JRDFGraphUnitTest.java
+ M /trunk/src/jar/jrdf/java/org/mulgara/jrdf/JRDFLocalGraphUnitTest.java
+ M /trunk/src/jar/krule/java/org/mulgara/krule/KruleLoader.java
+ M /trunk/src/jar/krule/java/org/mulgara/krule/QueryStruct.java
+ M /trunk/src/jar/krule/java/org/mulgara/krule/RuleStructure.java
+ A /trunk/src/jar/parser (from /branches/nw-interface/src/jar/parser:580)
+ R /trunk/src/jar/parser/build.xml (from /branches/nw-interface/src/jar/parser/build.xml:580)
+ R /trunk/src/jar/parser/java (from /branches/nw-interface/src/jar/parser/java:580)
+ R /trunk/src/jar/parser/parser-build.properties (from /branches/nw-interface/src/jar/parser/parser-build.properties:580)
+ M /trunk/src/jar/query/build.xml
+ A /trunk/src/jar/query/java/org/mulgara/connection (from /branches/nw-interface/src/jar/query/java/org/mulgara/connection:580)
+ R /trunk/src/jar/query/java/org/mulgara/connection/Connection.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/connection/Connection.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/connection/ConnectionException.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/connection/ConnectionException.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/connection/ConnectionFactory.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/connection/ConnectionFactory.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/connection/DummyConnection.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/connection/DummyConnection.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/connection/SessionConnection.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/connection/SessionConnection.java:580)
+ A /trunk/src/jar/query/java/org/mulgara/parser (from /branches/nw-interface/src/jar/query/java/org/mulgara/parser:580)
+ R /trunk/src/jar/query/java/org/mulgara/parser/Interpreter.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/parser/Interpreter.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/parser/MulgaraLexerException.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/parser/MulgaraLexerException.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/parser/MulgaraParserException.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/parser/MulgaraParserException.java:580)
+ M /trunk/src/jar/query/java/org/mulgara/query/AbstractConstraintExpression.java
+ M /trunk/src/jar/query/java/org/mulgara/query/Constraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintConjunction.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintDifference.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintDisjunction.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintExpression.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintFalse.java
+ A /trunk/src/jar/query/java/org/mulgara/query/ConstraintFilteredOperation.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/ConstraintFilteredOperation.java:580)
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintHaving.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintImpl.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintIs.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintNegation.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintNotOccurs.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintOccurs.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintOccursLessThan.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintOccursMoreThan.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintOperation.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ConstraintTrue.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ModelExpression.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ModelLiteral.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ModelOperation.java
+ M /trunk/src/jar/query/java/org/mulgara/query/ModelResource.java
+ M /trunk/src/jar/query/java/org/mulgara/query/Query.java
+ M /trunk/src/jar/query/java/org/mulgara/query/QueryUnitTest.java
+ M /trunk/src/jar/query/java/org/mulgara/query/SingleTransitiveConstraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/SpecialPredicates.java
+ M /trunk/src/jar/query/java/org/mulgara/query/TransitiveConstraint.java
+ M /trunk/src/jar/query/java/org/mulgara/query/WalkConstraint.java
+ A /trunk/src/jar/query/java/org/mulgara/query/operation (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/AddAlias.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/AddAlias.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/ApplyRules.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/ApplyRules.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/Backup.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Backup.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/BooleanSetCommand.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/BooleanSetCommand.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/Command.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Command.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/Commit.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Commit.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/DataTx.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/DataTx.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/Deletion.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Deletion.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/DropGraph.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/DropGraph.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/ExecuteScript.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/ExecuteScript.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/Help.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Help.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/Insertion.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Insertion.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/Load.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Load.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/LocalCommand.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/LocalCommand.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/Modification.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Modification.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/NullOp.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/NullOp.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/Quit.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Quit.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Restore.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/Rollback.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Rollback.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/ServerCommand.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/ServerCommand.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/SetAutoCommit.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/SetAutoCommit.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/SetCommand.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/SetCommand.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/SetTime.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/SetTime.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/SetUser.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/SetUser.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/TransactionCommand.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/TransactionCommand.java:580)
+ R /trunk/src/jar/query/java/org/mulgara/query/operation/TxOp.java (from /branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/TxOp.java:580)
+ M /trunk/src/jar/query/java/org/mulgara/query/rdf/Mulgara.java
+ M /trunk/src/jar/query/java/org/mulgara/server/Session.java
+ M /trunk/src/jar/query/java/org/mulgara/server/SessionFactoryFactory.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/AppendAggregateTuples.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/BasicDatabaseSessionUnitTest.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/CacheResolver.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/CacheResolverFactory.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/ConstraintOperations.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/Database.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseMetadataImpl.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSessionListQueryUnitTest.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSessionUnitTest.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/LocalJRDFDatabaseSession.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/LocalQueryResolver.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/ModelExistsOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/ModifyModelOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/OperationContext.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/QueryOperation.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/SubqueryAnswer.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/SubqueryAnswerUnitTest.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/TestDef.java
+ M /trunk/src/jar/resolver/java/org/mulgara/resolver/XADatabaseSessionUnitTest.java
+ M /trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/NetworkDelegator.java
+ M /trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/remote/StatementSetFactory.java
+ M /trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemResolverFactory.java
+ M /trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/WritableGISResolver.java
+ M /trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverFactory.java
+ M /trunk/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolution.java
+ M /trunk/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolver.java
+ M /trunk/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolverFactory.java
+ M /trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolverFactory.java
+ M /trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolverFactory.java
+ M /trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraint.java
+ M /trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraintDescriptor.java
+ M /trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolverFactory.java
+ M /trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolverUnitTest.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ConjunctiveTransformer.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ConjunctiveTransformerUnitTest.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ConstraintBindingHandler.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/QueryEvaluationContext.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ResolverFactoryInitializer.java
+ M /trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TripleSetWrapperStatements.java
+ M /trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolverFactory.java
+ M /trunk/src/jar/resolver-test/java/org/mulgara/resolver/test/TestConstraint.java
+ M /trunk/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverFactory.java
+ M /trunk/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverUnitTest.java
+ M /trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverFactory.java
+ M /trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverUnitTest.java
+ M /trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraint.java
+ M /trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalTransformationUnitTest.java
+ M /trunk/src/jar/server/java/org/mulgara/server/ServerInfo.java
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java
+ M /trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java
+ M /trunk/src/jar/sofa/java/org/mulgara/sofa/example/CameraPhoneOntologyApp.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/AbstractTuples.java
+ M /trunk/src/jar/tuples/java/org/mulgara/store/tuples/Tuples.java
+ M /trunk/src/jar/util/java/org/mulgara/util/NVPair.java
+ A /trunk/src/jar/util/java/org/mulgara/util/Reflect.java (from /branches/nw-interface/src/jar/util/java/org/mulgara/util/Reflect.java:580)
+ M /trunk/src/jar/util/java/org/mulgara/util/StringUtil.java
+ A /trunk/src/jar/util/java/org/mulgara/util/Tester.java (from /branches/nw-interface/src/jar/util/java/org/mulgara/util/Tester.java:580)
+ A /trunk/src/jar/util/java/org/mulgara/util/Tester2.java (from /branches/nw-interface/src/jar/util/java/org/mulgara/util/Tester2.java:580)
+
+Merge of nw-interface branch into the main trunk, using revisions 346:580
+------------------------------------------------------------------------
Modified: branches/mgr-61-sparql/LEGAL.txt
===================================================================
--- branches/mgr-61-sparql/LEGAL.txt 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/LEGAL.txt 2008-04-25 22:50:58 UTC (rev 855)
@@ -95,10 +95,12 @@
http://opensource.org/licenses/bsd-license.php
Castor
- JARs: castor-0.9.3.9-xml.jar
- URL: http://castor.org
- LICENSE: The Intalio License (BSD-style)
- http://www.castor.org/license.html
+ JARs: castor-1.2-codegen.jar
+ castor-1.2-xml.jar
+ castor-1.2-schema.jar
+ URL: http://castor.org/
+ LICENSE: Apache License Version 2.0
+ http://castor.org/new-license.txt
Commons Discovery
JARs: commons-discovery-1.2.jar
@@ -288,6 +290,12 @@
License GNU LGPL
http://www.opensource.org/licenses/lgpl-license.php
+ Velocity
+ JARs: velocity-1.5.jar
+ URL: http://velocity.apache.org/
+ License Apache License Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+
WSDL4J
JARs: wsdl4j-1.5.1.jar
URL: http://sourceforge.net/projects/wsdl4j
@@ -316,11 +324,11 @@
http://opensource.org/licenses/lgpl-license.php
EMORY UTILs
- JARs: emory-util.jar
- URL: http://dcl.mathcs.emory.edu/util/
+ JARs: emory-util-2.1-remote.jar
+ URL: http://dcl.mathcs.emory.edu/php/loadPage.php?content=/util/overview.html
LICENSE: Public domain
http://creativecommons.org/licenses/publicdomain
-
+
XOM 1.0
JARs: xom-1.0d21.jar
URL: http://www.xom.nu/
Modified: branches/mgr-61-sparql/build.properties
===================================================================
--- branches/mgr-61-sparql/build.properties 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/build.properties 2008-04-25 22:50:58 UTC (rev 855)
@@ -101,7 +101,9 @@
barracuda.jar =barracuda-1.2.6.jar
beep.jar =beepcore-0.9.08.jar
bsh.jar =bsh-2.0b1.jar
-castor.jar =castor-0.9.3.9-xml.jar
+castor-xml.jar =castor-1.2-xml.jar
+castor-xml-schema.jar =castor-1.2-xml-schema.jar
+castor-codegen.jar =castor-1.2-codegen.jar
commons-collections.jar =commons-collections-3.1.jar
commons-discovery.jar =commons-discovery-1.2.jar
commons-httpclient.jar =commons-httpclient-3.0.1.jar
@@ -109,7 +111,7 @@
commons-codec.jar =commons-codec-1.3.jar
date-utils.jar =DateUtils1.jar
d2r.jar =d2rmap-V02.jar
-emory-util.jar =emory-util.jar
+emory-util.jar =emory-util-2.1-remote.jar
httpclient.jar =${commons-httpclient.jar}
icu4j.jar =icu4j.jar
jargs.jar =jargs-0.2.jar
@@ -149,11 +151,6 @@
xmlParserAPIs.jar =xmlParserAPIs.jar
xom.jar =xom-1.0d21.jar
beaver.jar =beaver-0.9.6.1.jar
-mulgara-sparql.jar = mulgara-sparql-0.0.1.jar
+mulgara-sparql.jar =mulgara-sparql-0.0.1.jar
+velocity.jar =velocity-1.5.jar
-drools-version =2.0-beta-15
-drools-base.jar =drools-base-${drools-version}.jar
-drools-core.jar =drools-core-${drools-version}.jar
-drools-io.jar =drools-io-${drools-version}.jar
-drools-java.jar =drools-java-${drools-version}.jar
-drools-smf.jar =drools-smf-${drools-version}.jar
Modified: branches/mgr-61-sparql/build.xml
===================================================================
--- branches/mgr-61-sparql/build.xml 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/build.xml 2008-04-25 22:50:58 UTC (rev 855)
@@ -17,8 +17,6 @@
<property file="${jar.src.dir}/config/config-build.properties"/>
<property file="${jar.src.dir}/demo/demo-build.properties"/>
<property file="${jar.src.dir}/demo-mp3/demo-mp3-build.properties"/>
- <property file="${jar.src.dir}/connector/connector-build.properties"/>
- <property file="${jar.src.dir}/connection/connection-build.properties"/>
<property file="${jar.src.dir}/content-mbox/content-mbox-build.properties"/>
<property file="${jar.src.dir}/content-mp3/content-mp3-build.properties"/>
<property file="${jar.src.dir}/content-n3/content-n3-build.properties"/>
@@ -89,8 +87,6 @@
<import file="${jar.src.dir}/demo/build.xml"/>
<import file="${jar.src.dir}/demo-mp3/build.xml"/>
<import file="${jar.src.dir}/config/build.xml"/>
- <import file="${jar.src.dir}/connector/build.xml"/>
- <import file="${jar.src.dir}/connection/build.xml"/>
<import file="${jar.src.dir}/content-mbox/build.xml"/>
<import file="${jar.src.dir}/content-mp3/build.xml"/>
<import file="${jar.src.dir}/content-n3/build.xml"/>
@@ -315,7 +311,7 @@
<target name="base-dist"
depends="ant-task-dist,
- client-jrdf-dist, connector-dist, connection-dist, content-mbox-dist,
+ client-jrdf-dist, content-mbox-dist,
content-mp3-dist, content-rdfxml-dist, content-rio-dist,
descriptor-dist, driver-dist, dtd-dist, itql-dist, jrdf-dist,
store-dist, store-xa-dist, store-nodepool-dist,
@@ -496,9 +492,9 @@
lib/activation-1.0.2.jar, lib/icu4j.jar, lib/jena-2.1.jar, lib/antlr.jar,
lib/${date-utils.jar}, lib/${commons-logging.jar}, lib/beepcore-0.9.08.jar, lib/log4j-1.2.15.jar, lib/${lucene.jar}, lib/mail-1.3.jar,
lib/${jetty.jar}, lib/${jetty.plus.jar}, lib/${jasper.compiler.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,
- lib/castor-0.9.3.9-xml.jar, lib/trove-1.0.2.jar, lib/${jrdf.jar}, lib/${saaj.jar},
+ lib/${castor-xml.jar}, lib/${castor-codegen.jar}, lib/${castor-xml-schema.jar}, lib/trove-1.0.2.jar, lib/${jrdf.jar}, lib/${saaj.jar},
lib/${jakarta-oro.jar}, lib/jta-spec1_0_1.jar, lib/${jotm.jar}, lib/${jotm.jrmp.jar}, lib/${carol.jar}, lib/${howl.jar},
- lib/connector-1_5.jar, lib/${httpclient.jar}, lib/${commons-codec.jar}, lib/${mulgara-sparql.jar}"/>
+ lib/${jca.jar}, lib/${httpclient.jar}, lib/${commons-codec.jar}, lib/${mulgara-sparql.jar}"/>
<attribute name="Embedded-Main-Class" value="org.mulgara.server.EmbeddedMulgaraServer"/>
</manifest>
</target>
@@ -550,7 +546,7 @@
${log4j.jar}, ${icu4j.jar}, ${activation.jar}, ${beep.jar},
${jargs.jar}, ${jrdf.jar}, ${jetty.jar}, ${jetty.plus.jar},
${servlet.jar}, ${jasper.runtime.jar}, ${jasper.compiler.jar},
- ${lucene.jar}, ${mail.jar}, ${castor.jar}, ${trove.jar},
+ ${lucene.jar}, ${mail.jar}, ${castor-xml.jar}, ${castor-xml-schema.jar}, ${castor-codegen.jar}, ${trove.jar},
${date-utils.jar}, ${commons-logging.jar}, ${commons-httpclient.jar},
${commons-codec.jar}, ${emory-util.jar}, ${mulgara-sparql.jar}
${jotm.jar}, ${jotm.jrmp.jar}, ${carol.jar}, ${howl.jar}, ${jta.jar},
@@ -734,11 +730,11 @@
<target name="javadoc"
depends="javadoc-uptodate, javadoc-overview.html,
ant-task-jar, client-jrdf-jar, config-jar,
- connection-jar, content-mbox-jar, content-mp3-jar,
+ content-mbox-jar, content-mp3-jar,
content-n3-jar, content-rdfxml-jar, content-rio-jar,
itql-jar, sparql-int-jar,
doclet.jar, jrdf-jar, store-jar,
- store-xa-jar, connection-jar,
+ store-xa-jar,
store-nodepool-jar, store-nodepool-memory-jar,
store-nodepool-xa-jar, query-jar,
resolver-jar, resolver-file-jar, resolver-filesystem-jar,
@@ -825,7 +821,6 @@
<classpath path="${lib.dir}/xom-1.0d21.jar"/>
<sourcepath path="${ant-task.src.dir}/java"/>
<sourcepath path="${client-jrdf.src.dir}/java"/>
- <sourcepath path="${connection.src.dir}/java"/>
<sourcepath path="${content-mp3.src.dir}/java"/>
<sourcepath path="${content-n3.src.dir}/java"/>
<sourcepath path="${content-rdfxml.src.dir}/java"/>
@@ -893,8 +888,8 @@
<target name="create-javadoc"
depends="javadoc-uptodate, javadoc-overview.html, doclet.jar,
ant-task-javadoc,
- client-jrdf-javadoc, connector-javadoc,
- connection-javadoc, content-mbox-javadoc,
+ client-jrdf-javadoc,
+ content-mbox-javadoc,
content-mp3-javadoc, content-n3-javadoc,
content-rdfxml-javadoc, content-rio-javadoc,
descriptor-javadoc, driver-javadoc, dtd-javadoc,
@@ -1562,14 +1557,13 @@
<!-- =================================================================== -->
<!-- J2EE resource adapter -->
<!-- =================================================================== -->
- <target name="mulgara-rar" depends="connector-jar, driver-jar, query-jar">
+ <target name="mulgara-rar" depends="driver-jar, query-jar">
<jar jarfile="${bin.dir}/mulgara.rar">
<fileset dir="${src.dir}/rar/mulgara" includes="META-INF/ra.xml"/>
<fileset dir="${src.dir}/rar/mulgara/content"/>
- <fileset dir="${bin.dir}" includes="${connector.jar},
- ${driver.jar}, ${query.jar}"/>
+ <fileset dir="${bin.dir}" includes="${driver.jar}, ${query.jar}"/>
<fileset dir="${lib.dir}" includes="beepcore-*.jar"/>
</jar>
</target>
@@ -1752,7 +1746,9 @@
<zipfileset src="${lib.dir}/${lucene.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${mail.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${mulgara-sparql.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${castor.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${castor-xml.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${castor-xml-schema.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${castor-codegen.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${trove.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${date-utils.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${commons-logging.jar}" excludes="META-INF/**"/>
@@ -1915,7 +1911,7 @@
<target name="client-test"
depends="client-jrdf-test,
demo-mp3-test, driver-test, itql-test, query-test,
- connector-test, connection-test, descriptor-test"
+ descriptor-test"
description="Runs client side tests">
</target>
Modified: branches/mgr-61-sparql/common.properties
===================================================================
--- branches/mgr-61-sparql/common.properties 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/common.properties 2008-04-25 22:50:58 UTC (rev 855)
@@ -7,8 +7,8 @@
# Product properties
project =mulgara
description =Mulgara Semantic Store
-mulgara-version=1.1.1
-year =2001-2007
+mulgara-version=1.2.1
+year =2001-2008
default.build.label=${description} Version ${mulgara-version} (Build @@build@@)
# Build properties
Modified: branches/mgr-61-sparql/conf/mulgara-config.xml
===================================================================
--- branches/mgr-61-sparql/conf/mulgara-config.xml 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/conf/mulgara-config.xml 2008-04-25 22:50:58 UTC (rev 855)
@@ -70,7 +70,7 @@
org.mulgara.resolver.RelatedHandler.
-->
<RelatedQueryHandler
- class="org.mulgara.resolver.RelatedQueryHandlerImpl"/>
+ type="org.mulgara.resolver.RelatedQueryHandlerImpl"/>
<!--
Security adapter implementation. If this element is omitted, the only
@@ -86,44 +86,44 @@
and resolvers. The persistent resolver is used to manipulate the system
model.
-->
- <PersistentNodePoolFactory class="org.mulgara.store.nodepool.xa.XANodePoolFactory" dir="xaNodePool"/>
- <TemporaryNodePoolFactory class="org.mulgara.store.nodepool.memory.MemoryNodePoolFactory"/>
- <PersistentStringPoolFactory class="org.mulgara.store.stringpool.xa.XAStringPoolFactory" dir="xaStringPool"/>
- <TemporaryStringPoolFactory class="org.mulgara.store.stringpool.memory.MemoryStringPoolFactory"/>
- <PersistentResolverFactory class="org.mulgara.resolver.store.StatementStoreResolverFactory" dir="xaStatementStore"/>
- <TemporaryResolverFactory class="org.mulgara.resolver.memory.MemoryResolverFactory" dir="tempStatementStore"/>
+ <PersistentNodePoolFactory type="org.mulgara.store.nodepool.xa.XANodePoolFactory" dir="xaNodePool"/>
+ <TemporaryNodePoolFactory type="org.mulgara.store.nodepool.memory.MemoryNodePoolFactory"/>
+ <PersistentStringPoolFactory type="org.mulgara.store.stringpool.xa.XAStringPoolFactory" dir="xaStringPool"/>
+ <TemporaryStringPoolFactory type="org.mulgara.store.stringpool.memory.MemoryStringPoolFactory"/>
+ <PersistentResolverFactory type="org.mulgara.resolver.store.StatementStoreResolverFactory" dir="xaStatementStore"/>
+ <TemporaryResolverFactory type="org.mulgara.resolver.memory.MemoryResolverFactory" dir="tempStatementStore"/>
<!--
Implementations of a rule engine.
-->
- <RuleLoader class="org.mulgara.krule.KruleLoader"/>
+ <RuleLoader type="org.mulgara.krule.KruleLoader"/>
<!--
Implementations of the ContentHandler interface to use for resolving MIME
types.
-->
- <DefaultContentHandler class="org.mulgara.content.rdfxml.RDFXMLContentHandler"/>
+ <DefaultContentHandler type="org.mulgara.content.rdfxml.RDFXMLContentHandler"/>
<!--
- <DefaultContentHandler class="org.mulgara.content.rio.RDFXMLContentHandler"/>
+ <DefaultContentHandler type="org.mulgara.content.rio.RDFXMLContentHandler"/>
-->
- <ContentHandler class="org.mulgara.content.mp3.MP3ContentHandler"/>
- <ContentHandler class="org.mulgara.content.mbox.MBoxContentHandler"/>
- <ContentHandler class="org.mulgara.content.n3.N3ContentHandler"/>
+ <ContentHandler type="org.mulgara.content.mp3.MP3ContentHandler"/>
+ <ContentHandler type="org.mulgara.content.mbox.MBoxContentHandler"/>
+ <ContentHandler type="org.mulgara.content.n3.N3ContentHandler"/>
<!--
Additional resolvers
-->
- <ResolverFactory class="org.mulgara.resolver.file.FileResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.lucene.LuceneResolverFactory" dir="lucene"/>
- <ResolverFactory class="org.mulgara.resolver.xsd.XSDResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.http.HttpResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.nodetype.NodeTypeResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.jar.JarResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.view.ViewResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.filesystem.FileSystemResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.prefix.PrefixResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.relational.RelationalResolverFactory"/>
- <ResolverFactory class="org.mulgara.resolver.distributed.DistributedResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.file.FileResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.lucene.LuceneResolverFactory" dir="lucene"/>
+ <ResolverFactory type="org.mulgara.resolver.xsd.XSDResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.http.HttpResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.nodetype.NodeTypeResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.jar.JarResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.view.ViewResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.filesystem.FileSystemResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.prefix.PrefixResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.relational.RelationalResolverFactory"/>
+ <ResolverFactory type="org.mulgara.resolver.distributed.DistributedResolverFactory"/>
<!-- iTQL script to run on startup -->
<StartupScript>foo.itql</StartupScript>
Modified: branches/mgr-61-sparql/conf/mulgara-embedded.xsd
===================================================================
--- branches/mgr-61-sparql/conf/mulgara-embedded.xsd 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/conf/mulgara-embedded.xsd 2008-04-25 22:50:58 UTC (rev 855)
@@ -42,69 +42,69 @@
<xs:element name="Smtp" type="xs:string"/>
<xs:element name="RelatedQueryHandler">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="SecurityAdapterFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="PersistentNodePoolFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="PersistentStringPoolFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="PersistentResolverFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="TemporaryNodePoolFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="TemporaryStringPoolFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="TemporaryResolverFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="RuleLoader">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="TransactionTimeout" type="xs:int"/>
<xs:element name="DefaultContentHandler">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="ContentHandler">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="ResolverFactory">
<xs:complexType>
- <xs:attribute name="class" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="dir" type="xs:string"/>
</xs:complexType>
</xs:element>
@@ -122,17 +122,17 @@
<xs:element ref="RelatedQueryHandler"/>
<xs:element ref="SecurityAdapterFactory" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="PersistentNodePoolFactory"/>
+ <xs:element ref="TemporaryNodePoolFactory"/>
<xs:element ref="PersistentStringPoolFactory"/>
+ <xs:element ref="TemporaryStringPoolFactory"/>
<xs:element ref="PersistentResolverFactory"/>
- <xs:element ref="TemporaryNodePoolFactory"/>
- <xs:element ref="TemporaryStringPoolFactory"/>
<xs:element ref="TemporaryResolverFactory"/>
- <xs:element ref="ResolverFactory" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="RuleLoader"/>
<xs:element ref="DefaultContentHandler" minOccurs="1"/>
<xs:element ref="ContentHandler" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="ResolverFactory" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="StartupScript" minOccurs="0"/>
<xs:element ref="Smtp"/>
- <xs:element ref="RuleLoader"/>
</xs:sequence>
</xs:complexType>
</xs:element>
Modified: branches/mgr-61-sparql/jxdata/iTQL/backup_restore/test.jxu
===================================================================
--- branches/mgr-61-sparql/jxdata/iTQL/backup_restore/test.jxu 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/jxdata/iTQL/backup_restore/test.jxu 2008-04-25 22:50:58 UTC (rev 855)
@@ -246,7 +246,6 @@
<fail>Output failed. Check badQuery6Result.xml for output.</fail>
</ifEqual>
-<!--
<set name="query" value="restore <@server@> from local <@baseuri@/tmp/server.gz>;"/>
<eval stepClass="org.mulgara.store.jxunit.QueryJX" />
@@ -263,8 +262,22 @@
<fail>Output failed. Check BadQuery3Result.xml for output.</fail>
</ifEqual>
--->
+ <set name="query" value="restore <@server@> from <@baseuri@/tmp/server.gz>;"/>
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResult7.txt" name="queryResult">
+ <save name="queryResult" file="badQuery7-bResult.xml"/>
+ <fail>Output failed. Check badQuery7-bResult.xml for output.</fail>
+ </ifEqual>
+
+ <set name="query" value="select $p from <@server@#backup2> where $s $p $o order by $p;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResult3.txt" name="queryResult">
+ <save name="queryResult" file="badQuery3-bResult.xml"/>
+ <fail>Output failed. Check BadQuery3-bResult.xml for output.</fail>
+ </ifEqual>
+
<!-- ================================== -->
<!-- BACKUP 4 -->
<!-- ================================== -->
Deleted: branches/mgr-61-sparql/lib/castor-0.9.3.9-xml.jar
===================================================================
(Binary files differ)
Copied: branches/mgr-61-sparql/lib/castor-1.2-codegen.jar (from rev 854, trunk/lib/castor-1.2-codegen.jar)
===================================================================
(Binary files differ)
Copied: branches/mgr-61-sparql/lib/castor-1.2-xml-schema.jar (from rev 854, trunk/lib/castor-1.2-xml-schema.jar)
===================================================================
(Binary files differ)
Copied: branches/mgr-61-sparql/lib/castor-1.2-xml.jar (from rev 854, trunk/lib/castor-1.2-xml.jar)
===================================================================
(Binary files differ)
Copied: branches/mgr-61-sparql/lib/emory-util-2.1-remote.jar (from rev 854, trunk/lib/emory-util-2.1-remote.jar)
===================================================================
(Binary files differ)
Deleted: branches/mgr-61-sparql/lib/emory-util.jar
===================================================================
(Binary files differ)
Copied: branches/mgr-61-sparql/lib/velocity-1.5.jar (from rev 854, trunk/lib/velocity-1.5.jar)
===================================================================
(Binary files differ)
Modified: branches/mgr-61-sparql/src/jar/client-jrdf/java/org/mulgara/client/jrdf/test/ClientGraphUnitTest.java
===================================================================
--- branches/mgr-61-sparql/src/jar/client-jrdf/java/org/mulgara/client/jrdf/test/ClientGraphUnitTest.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/client-jrdf/java/org/mulgara/client/jrdf/test/ClientGraphUnitTest.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -182,6 +182,7 @@
*
* @throws Exception
*/
+ @SuppressWarnings("deprecation") // avoiding the use of a connection
public void testCreate() throws Exception {
// log that we're executing the test
@@ -192,7 +193,7 @@
log.debug("Testing Answer implementation");
//get all statments from the graph
- Answer answer = this.getEntireGraph(graphURI);
+ Answer answer = getEntireGraph(graphURI);
//create a Client Graph from it.
ClientGraph client = AbstractGraphFactory.createGraph(answer, answerBean.getSession(serverURI));
@@ -225,7 +226,7 @@
//Answer
log.debug("Testing Answer implementation");
- this.testAnswerFind();
+ testAnswerFind();
log.debug("Testing Answer implementation successful");
} catch (Exception exception) {
exception.printStackTrace();
@@ -238,10 +239,11 @@
*
* @throws Exception
*/
+ @SuppressWarnings("deprecation") // avoiding the use of a connection
public void testAnswerFind() throws Exception {
//create a Client Graph from it.
- Answer answer = this.getEntireGraph(graphURI);
+ Answer answer = getEntireGraph(graphURI);
ClientGraph client = AbstractGraphFactory.createGraph(answer, answerBean.getSession(serverURI));
GraphElementFactory factory = client.getElementFactory();
@@ -252,19 +254,19 @@
ClosableIterator iter = client.find(triple);
//compare with answer
- this.compareAnswerToIterator(answer, iter, factory);
+ compareAnswerToIterator(answer, iter, factory);
//close iterator
iter.close();
//-- FIND SUBJECT (S) --
- this.testAnswerFindSubjects(client, factory);
+ testAnswerFindSubjects(client, factory);
//-- FIND PREDICATE (S) --
- this.testAnswerFindPredicates(client, factory);
+ testAnswerFindPredicates(client, factory);
//-- FIND OBJECT (S) --
- this.testAnswerFindObjects(client, factory);
+ testAnswerFindObjects(client, factory);
//close graph
client.close();
@@ -285,7 +287,7 @@
subject)),
null, null);
ClosableIterator iter = client.find(triple);
- this.compareAnswerToIterator(this.getSubject("<" + subject + ">"), iter,
+ compareAnswerToIterator(getSubject("<" + subject + ">"), iter,
factory);
iter.close();
@@ -294,7 +296,7 @@
triple = factory.createTriple(factory.createResource(URI.create(subject)),
null, null);
iter = client.find(triple);
- this.compareAnswerToIterator(this.getSubject("<" + subject + ">"), iter,
+ compareAnswerToIterator(getSubject("<" + subject + ">"), iter,
factory);
iter.close();
@@ -303,7 +305,7 @@
triple = factory.createTriple(factory.createResource(URI.create(subject)),
null, null);
iter = client.find(triple);
- this.compareAnswerToIterator(this.getSubject("<" + subject + ">"), iter,
+ compareAnswerToIterator(getSubject("<" + subject + ">"), iter,
factory);
iter.close();
}
@@ -324,7 +326,7 @@
predicate)),
null);
ClosableIterator iter = client.find(triple);
- this.compareAnswerToIterator(this.getPredicate("<" + predicate + ">"), iter,
+ compareAnswerToIterator(getPredicate("<" + predicate + ">"), iter,
factory);
iter.close();
@@ -334,7 +336,7 @@
factory.createResource(URI.create(predicate)),
null);
iter = client.find(triple);
- this.compareAnswerToIterator(this.getPredicate("<" + predicate + ">"), iter,
+ compareAnswerToIterator(getPredicate("<" + predicate + ">"), iter,
factory);
iter.close();
@@ -344,7 +346,7 @@
factory.createResource(URI.create(predicate)),
null);
iter = client.find(triple);
- this.compareAnswerToIterator(this.getPredicate("<" + predicate + ">"), iter,
+ compareAnswerToIterator(getPredicate("<" + predicate + ">"), iter,
factory);
iter.close();
}
@@ -364,7 +366,7 @@
factory.createResource(URI.
create(object)));
ClosableIterator iter = client.find(triple);
- this.compareAnswerToIterator(this.getObject("<" + object + ">"), iter,
+ compareAnswerToIterator(getObject("<" + object + ">"), iter,
factory);
iter.close();
@@ -373,7 +375,7 @@
triple = factory.createTriple(null, null,
factory.createResource(URI.create(object)));
iter = client.find(triple);
- this.compareAnswerToIterator(this.getObject("<" + object + ">"), iter,
+ compareAnswerToIterator(getObject("<" + object + ">"), iter,
factory);
iter.close();
@@ -382,7 +384,7 @@
triple = factory.createTriple(null, null,
factory.createResource(URI.create(object)));
iter = client.find(triple);
- this.compareAnswerToIterator(this.getObject("<" + object + ">"), iter,
+ compareAnswerToIterator(getObject("<" + object + ">"), iter,
factory);
iter.close();
@@ -390,7 +392,7 @@
object = "Test1";
triple = factory.createTriple(null, null, factory.createLiteral(object));
iter = client.find(triple);
- this.compareAnswerToIterator(this.getObject("'" + object + "'"), iter,
+ compareAnswerToIterator(getObject("'" + object + "'"), iter,
factory);
iter.close();
@@ -398,7 +400,7 @@
object = "Test2";
triple = factory.createTriple(null, null, factory.createLiteral(object));
iter = client.find(triple);
- this.compareAnswerToIterator(this.getObject("'" + object + "'"), iter,
+ compareAnswerToIterator(getObject("'" + object + "'"), iter,
factory);
iter.close();
@@ -406,7 +408,7 @@
object = "Test3";
triple = factory.createTriple(null, null, factory.createLiteral(object));
iter = client.find(triple);
- this.compareAnswerToIterator(this.getObject("'" + object + "'"), iter,
+ compareAnswerToIterator(getObject("'" + object + "'"), iter,
factory);
iter.close();
}
@@ -469,7 +471,7 @@
//needed for comparision
"order by $s $p $o ;";
- return this.answerBean.executeQuery(query);
+ return answerBean.executeQuery(query);
}
/**
@@ -481,13 +483,13 @@
//select ALL query
String query = "select $s $p $o " +
- "from <" + this.graphURI + "> " +
+ "from <" + graphURI + "> " +
"where " + variable + "<http://mulgara.org/mulgara#is> " + uri + " " +
"and $s $p $o " +
//needed for comparision
"order by $s $p $o ;";
- return this.interpreterBean.executeQuery(query);
+ return interpreterBean.executeQuery(query);
}
/**
@@ -497,7 +499,7 @@
*/
private Answer getSubject(String subject) throws Exception {
- return this.getColumn(subject, "$s");
+ return getColumn(subject, "$s");
}
/**
@@ -507,7 +509,7 @@
*/
private Answer getPredicate(String predicate) throws Exception {
- return this.getColumn(predicate, "$p");
+ return getColumn(predicate, "$p");
}
/**
@@ -517,7 +519,7 @@
*/
private Answer getObject(String object) throws Exception {
- return this.getColumn(object, "$o");
+ return getColumn(object, "$o");
}
/**
@@ -526,31 +528,32 @@
*
* @throws Exception
*/
+ @SuppressWarnings("deprecation") // avoiding the use of a Connection
public void testAnswerOutputRDF() throws Exception {
//create a Client Graph containing all statments
- ClientGraph client1 = AbstractGraphFactory.createGraph(this.getEntireGraph(graphURI), answerBean.getSession(serverURI));
+ ClientGraph client1 = AbstractGraphFactory.createGraph(getEntireGraph(graphURI), answerBean.getSession(serverURI));
File rdfOutput1 = new File(CLIENT_TEST_FILE1);
- this.outputRDF(rdfOutput1, client1);
+ outputRDF(rdfOutput1, client1);
//reload file into new model
- URI graph2 = new URI("" + this.graphURI + "2");
- this.createModel(graph2);
- this.interpreterBean.load(rdfOutput1, graph2);
+ URI graph2 = new URI("" + graphURI + "2");
+ createModel(graph2);
+ interpreterBean.load(rdfOutput1, graph2);
//output new model
- ClientGraph client2 = AbstractGraphFactory.createGraph(this.getEntireGraph(graph2), answerBean.getSession(serverURI));
+ ClientGraph client2 = AbstractGraphFactory.createGraph(getEntireGraph(graph2), answerBean.getSession(serverURI));
File rdfOutput2 = new File(CLIENT_TEST_FILE2);
- this.outputRDF(rdfOutput2, client2);
+ outputRDF(rdfOutput2, client2);
//compare files
assertTrue("RDF output file is not equal to file that was loaded.",
- this.compareFiles(rdfOutput1, rdfOutput2));
+ compareFiles(rdfOutput1, rdfOutput2));
//tidy up
client1.close();
client2.close();
- this.dropModel(graph2);
+ dropModel(graph2);
}
/**
@@ -566,8 +569,8 @@
//value to be returned
boolean compare = false;
- byte[] digest1 = this.digest(file1);
- byte[] digest2 = this.digest(file2);
+ byte[] digest1 = digest(file1);
+ byte[] digest2 = digest(file2);
//compare the bytes
if (digest1.length == digest2.length) {
@@ -608,8 +611,7 @@
do {
read = digestIn.read(buffer);
- }
- while (read != -1);
+ } while (read != -1);
//digest
return digestIn.getMessageDigest().digest();
@@ -644,7 +646,7 @@
//select ALL query
String query = "create <" + modelURI + "> ;";
- return this.interpreterBean.executeQuery(query);
+ return interpreterBean.executeQuery(query);
}
/**
@@ -657,7 +659,7 @@
//select ALL query
String query = "drop <" + modelURI + "> ;";
- return this.interpreterBean.executeQuery(query);
+ return interpreterBean.executeQuery(query);
}
/**
@@ -668,10 +670,9 @@
private Answer populateModel() throws Exception {
//select ALL query
- String query = "insert " + this.testStatements +
- "into <" + this.graphURI + "> ;";
+ String query = "insert " + testStatements + "into <" + graphURI + "> ;";
- return this.interpreterBean.executeQuery(query);
+ return interpreterBean.executeQuery(query);
}
//set up and tear down
@@ -691,27 +692,20 @@
graphURI = new URI("rmi", hostname, "/" + SERVER_NAME, "clientJenaTest");
//create an iTQLInterpreterBean for executing queries with
- this.interpreterBean = new ItqlInterpreterBean();
- this.answerBean = new ItqlInterpreterBean();
+ interpreterBean = new ItqlInterpreterBean();
+ answerBean = new ItqlInterpreterBean();
- //initialize with server
- this.interpreterBean.setServerURI(this.serverURI.toString());
-
//initialize model
- this.createModel(this.graphURI);
- this.populateModel();
- }
- catch (Exception exception) {
-
+ createModel(graphURI);
+ populateModel();
+ } catch (Exception exception) {
//try to tear down first
try {
-
tearDown();
+ } catch (Throwable t) {
+ // going to throw the original
}
- finally {
-
- throw exception;
- }
+ throw exception;
}
}
@@ -722,9 +716,9 @@
*/
public void tearDown() throws Exception {
- this.dropModel(this.graphURI);
+ dropModel(graphURI);
- this.interpreterBean.close();
- this.answerBean.close();
+ interpreterBean.close();
+ answerBean.close();
}
}
Modified: branches/mgr-61-sparql/src/jar/config/build.xml
===================================================================
--- branches/mgr-61-sparql/src/jar/config/build.xml 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/config/build.xml 2008-04-25 22:50:58 UTC (rev 855)
@@ -28,7 +28,7 @@
<mkdir dir="${obj.dir}/jar/config/java"/>
- <java fork="true" jvm="${java.home}/bin/java" classname="org.exolab.castor.builder.SourceGenerator" failonerror="yes">
+ <java fork="true" jvm="${java.home}/bin/java" classname="org.exolab.castor.builder.SourceGeneratorMain" failonerror="yes">
<jvmarg value="${arch.bits}"/>
@@ -42,7 +42,7 @@
<arg value="${obj.dir}/jar/config/java"/>
<classpath>
- <fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar, castor*.jar"/>
+ <fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar, castor*.jar, commons-logging*.jar, velocity*.jar"/>
</classpath>
</java>
</target>
Modified: branches/mgr-61-sparql/src/jar/demo-mp3/build.xml
===================================================================
--- branches/mgr-61-sparql/src/jar/demo-mp3/build.xml 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/demo-mp3/build.xml 2008-04-25 22:50:58 UTC (rev 855)
@@ -69,7 +69,8 @@
<fileset file="${demo-mp3.conf.dir}/${demo-mp3.conf.default}"/>
<fileset file="${demo-mp3.conf.dir}/${demo-mp3.schema.default}"/>
<zipfileset src="${lib.dir}/${jlayer.jar}" excludes="META-INF/**"/>
- <zipfileset src="${lib.dir}/${castor.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${castor-xml.jar}" excludes="META-INF/**"/>
+ <zipfileset src="${lib.dir}/${castor-xml-schema.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${xerces.jar}" excludes="META-INF/**"/>
</jar>
</target>
@@ -143,7 +144,7 @@
<delete dir="${demo-mp3.obj.src.dir}/java"/>
<mkdir dir="${demo-mp3.obj.src.dir}/java"/>
<java fork="true" jvm="${java.home}/bin/java"
- classname="org.exolab.castor.builder.SourceGenerator" failonerror="yes">
+ classname="org.exolab.castor.builder.SourceGeneratorMain" failonerror="yes">
<jvmarg value="${arch.bits}"/>
<sysproperty key="java.io.tmpdir" value="${tmp.dir}"/>
<arg value="-i"/>
@@ -154,7 +155,7 @@
<arg value="${demo-mp3.obj.src.dir}/java"/>
<classpath>
<fileset dir="${lib.dir}"
- includes="xerces*.jar, xmlParserAPIs.jar, castor*.jar"/>
+ includes="xerces*.jar, xmlParserAPIs.jar, castor*.jar, commons-logging*.jar, velocity*.jar"/>
</classpath>
</java>
</target>
Modified: branches/mgr-61-sparql/src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing/Mp3Application.java
===================================================================
--- branches/mgr-61-sparql/src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing/Mp3Application.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing/Mp3Application.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -33,7 +33,6 @@
import java.util.List;
import java.io.*;
import java.net.*;
-import java.util.*;
// Logging
import org.apache.log4j.*;
@@ -69,13 +68,12 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
+ at SuppressWarnings("serial")
public class Mp3Application extends JFrame {
- /**
- * Logger. This is named after the class.
- */
- private final static Logger log = Logger.getLogger(Mp3Application.class.
- getName());
+ /** Logger. This is named after the class. */
+ @SuppressWarnings("unused")
+ private final static Logger log = Logger.getLogger(Mp3Application.class.getName());
/** Name of the Application */
private static final String DEFAULT_APPLICATION_NAME = "Mulgara Mp3 Player";
@@ -240,6 +238,7 @@
* Initializes the Models and data
* @throws Exception
*/
+ @SuppressWarnings("unchecked") // cannot add types to generated code
private void init() throws Exception {
//getConfig from the file
config = (config != null) ? config :
@@ -248,16 +247,13 @@
//Create the Models (may not exist yet)
getController().createModels();
//load schemas
- List schemas = config.getSchemaFiles();
+ List<URIReference> schemas = (List<URIReference>)config.getSchemaFiles();
SchemaModel schemaModel = getController().getSchemaModel();
if (schemas == null) {
throw new IllegalStateException("Mp3ConfigFile returned a null " +
"Schema File List.");
}
- Iterator iter = schemas.iterator();
- while (iter.hasNext()) {
- schemaModel.loadSchema((URIReference) iter.next());
- }
+ for (URIReference schema: schemas) schemaModel.loadSchema(schema);
}
/**
@@ -495,6 +491,7 @@
* Run the application.
* @param args String[]
*/
+ @SuppressWarnings("deprecation")
public static void main(String[] args) {
try {
// Just use the basic Log configurator
Modified: branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlAutoInterpreter.java
===================================================================
--- branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlAutoInterpreter.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlAutoInterpreter.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -104,7 +104,7 @@
return true;
}
if (cmd == null) {
- lastMessage = "";
+ lastMessage = null;
return true;
}
@@ -120,6 +120,8 @@
lastMessage = "Error: " + e.getMessage();
}
+ assert lastMessage != null;
+
// test if the command wants the user to quit - return false if it does
return !(cmd.isLocalOperation() && ((LocalCommand)cmd).isQuitCommand());
}
Modified: branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java
===================================================================
--- branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -191,6 +191,7 @@
// Reset the variable incrementer in the query.
variableFactory.reset();
+ resetInterpreter();
// log the iTQL command - system property itql.command.log must be set
@@ -215,7 +216,6 @@
commandTree = parser.parse();
// Build the command. This populates lastCommand
- resetInterpreter();
commandTree.apply(this);
if (logger.isDebugEnabled()) logger.debug("Successfully parsed command " + command);
Modified: branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlSession.java
===================================================================
--- branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlSession.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlSession.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -56,10 +56,10 @@
private static final String EOL = System.getProperty("line.separator");
/** The prompt. */
- public final static String PS1 = "iTQL> ";
+ public final static String PS1 = "TQL> ";
/** The secondary prompt, indicating an incomplete command. */
- public final static String PS2 = " ";
+ public final static String PS2 = "---> ";
/** The log4j configuration file path (within the JAR file) */
private final static String LOG4J_CONFIG_PATH = "log4j-tql.xml";
@@ -104,7 +104,12 @@
/** A functor for splitting commands apart. */
private CommandSplitter commandSplitter = null;
+
+ /** A flag to indicate that an executed command was complete */
+ private boolean incomplete = false;
+ /** The last command that was run. */
+ private String lastCommand = "";
/**
* Start an interactive TQL session from the command prompt.
@@ -197,6 +202,16 @@
/**
+ * Indicates if the last issued command was complete. If not, then a semicolon was not found
+ * to terminate the command.
+ * @return <code>false</code> only if the last command was complete. <code>true</code> if it completed.
+ */
+ boolean isCommandIncomplete() {
+ return incomplete;
+ }
+
+
+ /**
* Executes a series of commands the given command. Accumulates all the
* results of these commands into the answers and messages lists.
* @param command The command to execute
@@ -206,15 +221,35 @@
answers.clear();
messages.clear();
+ boolean previouslyIncomplete = incomplete;
+
+ // presume ensuing commands are complete
+ incomplete = false;
for (String query: commandSplitter.split(command)) {
+ // clear out empty commands
+ if (incomplete) incomplete = false;
- if (log.isDebugEnabled()) log.debug("Starting execution of command \"" + command + "\"");
+ // check if we need to follow on
+ if (previouslyIncomplete) {
+ query = lastCommand + query;
+ previouslyIncomplete = false;
+ }
+ lastCommand = query + " ";
+ if (log.isDebugEnabled()) log.debug("Starting execution of command \"" + query + "\"");
+
// execute the command
if (!autoTql.executeCommand(query)) {
close();
return;
}
+
+ String msg = autoTql.getLastMessage();
+ if (msg == null) {
+ if (log.isDebugEnabled()) log.debug("Need to follow on for an incomplete command.");
+ incomplete = true;
+ continue;
+ }
if (log.isDebugEnabled()) log.debug("Completed execution of commmand \"" + command + "\"");
@@ -222,7 +257,7 @@
if (e != null) log.warn("Couldn't execute command", e);
// Add the message and answer
- messages.add(autoTql.getLastMessage());
+ messages.add(msg);
Answer answer = autoTql.getLastAnswer();
if (answer != null) answers.add(answer);
Modified: branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlSessionUI.java
===================================================================
--- branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlSessionUI.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/itql/java/org/mulgara/itql/TqlSessionUI.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -99,7 +99,7 @@
/** Whether we are running a command still. */
private volatile boolean runningCommand = false;
-
+
/**
* Create a new UI representation.
* @param newItqlSession the itql session to call when we receive commands and
@@ -303,7 +303,7 @@
}
// Handle back space - don't let it go too far back.
- if (e.paramString().indexOf("Backspace") != -1) {
+ if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE || e.paramString().indexOf("Backspace") != -1) {
if (text.getCaretPosition() <= cursorPosition) {
@@ -406,6 +406,7 @@
if (command.length() != 0) {
// Put the command at the end of the array.
history.add(command);
+
command = command + NEWLINE;
// If the array gets too large remove the last entry.
@@ -427,7 +428,7 @@
* Prints out the prompt.
*/
public void printPrompt() {
- print(NEWLINE + TqlSession.PROMPT);
+ print(NEWLINE + (tqlSession.isCommandIncomplete() ? TqlSession.PS2 : TqlSession.PROMPT));
historyIndex = 0;
text.repaint();
}
Modified: branches/mgr-61-sparql/src/jar/query/build.xml
===================================================================
--- branches/mgr-61-sparql/src/jar/query/build.xml 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/query/build.xml 2008-04-25 22:50:58 UTC (rev 855)
@@ -22,7 +22,6 @@
<path refid="common-classpath"/>
<fileset file="${util.dist.dir}/${util.jar}"/>
<fileset file="${rules.dist.dir}/${rules.jar}"/>
- <fileset file="${connection.dist.dir}/${rules.jar}"/>
</path>
<path id="query-test-classpath">
@@ -31,7 +30,6 @@
<fileset file="${query.dist.dir}/${query.jar}"/>
<fileset file="${rules.dist.dir}/${rules.jar}"/>
- <fileset file="${connection.dist.dir}/${rules.jar}"/>
</path>
<target name="query-clean"
@@ -71,7 +69,7 @@
</target>
<target name="query-compile"
- depends="-query-prepare, util-jar, rules-jar, connection-jar, config-jar, -query-unjar-config"
+ depends="-query-prepare, util-jar, rules-jar, config-jar, -query-unjar-config"
description="Compiles all query related files included generated
source code"
unless="query.classes.uptodate">
Modified: branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/filter/TestContext.java
===================================================================
--- branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/filter/TestContext.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/filter/TestContext.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -134,7 +134,7 @@
globalizer.put(storedId, v);
localizer.put(v, storedId);
} else {
- assert globalizer.get(storedId) == v : "Bidirectional mapping for nodes<->ID failed";
+ assert globalizer.get(storedId).equals(v) : "Bidirectional mapping for nodes<->ID failed";
}
}
}
Modified: branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/Backup.java
===================================================================
--- branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/Backup.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/Backup.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -76,7 +76,7 @@
*/
public Object execute(Connection conn) throws QueryException, MalformedURLException {
// test if the server can do all the work, or if data needs to be streamed
- if (isLocal()) {
+ if (!isLocal()) {
// server does all the work
conn.getSession().backup(getSource(), getDestination());
} else {
Modified: branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/DataTx.java
===================================================================
--- branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/DataTx.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/DataTx.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -125,7 +125,7 @@
* @throws QueryException There was an error working with data at the server end.
* @throws IOException There was an error transferring data over the network.
*/
- protected long sendMarshalledData(Connection conn) throws QueryException, IOException {
+ protected long sendMarshalledData(Connection conn, boolean compressable) throws QueryException, IOException {
if (logger.isInfoEnabled()) logger.info("loading local resource : " + source);
RemoteInputStreamSrvImpl srv = null;
@@ -133,7 +133,9 @@
try {
// is the file/stream compressed?
- InputStream inputStream = adjustForCompression(source.toURL());
+ InputStream inputStream;
+ if (compressable) inputStream = adjustForCompression(source.toURL());
+ else inputStream = (overrideStream != null) ? overrideStream : source.toURL().openStream();
// open and wrap the inputstream
srv = new RemoteInputStreamSrvImpl(inputStream);
Modified: branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/Load.java
===================================================================
--- branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/Load.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/Load.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -57,7 +57,7 @@
URI src = getSource();
URI dest = getDestination();
try {
- long stmtCount = isLocal() ? sendMarshalledData(conn) : conn.getSession().setModel(dest, srcRsc);
+ long stmtCount = isLocal() ? sendMarshalledData(conn, true) : conn.getSession().setModel(dest, srcRsc);
if (logger.isDebugEnabled()) logger.debug("Loaded " + stmtCount + " statements from " + src + " into " + dest);
if (stmtCount > 0L) setResultMessage("Successfully loaded " + stmtCount + " statements from " + src + " into " + dest);
Modified: branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/Restore.java
===================================================================
--- branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/Restore.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/query/java/org/mulgara/query/operation/Restore.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -14,6 +14,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
+import java.util.HashSet;
+import java.util.Set;
import org.mulgara.connection.Connection;
import org.mulgara.query.QueryException;
@@ -48,8 +50,9 @@
public Object execute(Connection conn) throws QueryException {
URI src = getSource();
URI dest = getDestination();
+ if (serverTest(dest)) throw new QueryException("Cannot restore to a graph. Must be a server URI.");
try {
- if (isLocal()) sendMarshalledData(conn);
+ if (isLocal()) sendMarshalledData(conn, false);
else conn.getSession().restore(dest, src);
if (logger.isDebugEnabled()) logger.debug("Completed restoring " + dest + " from " + src);
@@ -72,4 +75,23 @@
return 0L;
}
+ /** The known set of schemas describing servers. */
+ private static Set<String> knownSchemas = new HashSet<String>();
+ static {
+ knownSchemas.add("rmi");
+ knownSchemas.add("local");
+ knownSchemas.add("beep");
+ }
+
+
+ /**
+ * Tests if a URI can potentially refer to a server. This will only apply for known schemas.
+ * @param serverURI The URI to check.
+ * @return <code>false</code> if the URI refers to a known graph. <code>true</code> if we can't
+ * tell or it is known to refer to a server.
+ */
+ protected boolean serverTest(URI serverURI) {
+ if (knownSchemas.contains(serverURI.getScheme())) return serverURI.getFragment() != null;
+ return true;
+ }
}
Modified: branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java
===================================================================
--- branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -94,6 +94,7 @@
private static final URI databaseURI = URI.create("local:database");
+ private static final URI systemModelURI = URI.create("local:database#");
private static final URI modelURI = URI.create("local:database#model");
private static final URI model2URI = URI.create("local:database#model2");
private static final URI model3URI = URI.create("local:database#model3");
@@ -117,6 +118,7 @@
suite.addTest(new AdvDatabaseSessionUnitTest("testConcurrentSubqueryQuery"));
suite.addTest(new AdvDatabaseSessionUnitTest("testConcurrentReadWrite"));
suite.addTest(new AdvDatabaseSessionUnitTest("testExplicitBasicQuery"));
+ suite.addTest(new AdvDatabaseSessionUnitTest("testAnswerWriteCloseIsolation"));
suite.addTest(new AdvDatabaseSessionUnitTest("testExplicitIsolationQuery"));
suite.addTest(new AdvDatabaseSessionUnitTest("testExplicitRollbackIsolationQuery"));
suite.addTest(new AdvDatabaseSessionUnitTest("testExplicitCommitIsolationQuery"));
@@ -672,6 +674,54 @@
}
+ public void testAnswerWriteCloseIsolation() throws URISyntaxException {
+ logger.info("Testing AnswerWriteCloseIsolation");
+
+ try {
+ Session session = database.newSession();
+ try {
+ Variable subjectVariable = new Variable("subject");
+ Variable predicateVariable = new Variable("predicate");
+ Variable objectVariable = new Variable("object");
+
+ List<SelectElement> selectList = new ArrayList<SelectElement>(3);
+ selectList.add(subjectVariable);
+ selectList.add(predicateVariable);
+ selectList.add(objectVariable);
+
+ // Evaluate the query
+ Answer answer = session.query(new Query(
+ selectList, // SELECT
+ new ModelResource(systemModelURI), // FROM
+ new ConstraintImpl(subjectVariable, // WHERE
+ predicateVariable,
+ objectVariable),
+ null, // HAVING
+ Arrays.asList(new Order[] { // ORDER BY
+ new Order(subjectVariable, true),
+ new Order(predicateVariable, true),
+ new Order(objectVariable, true)
+ }),
+ null, // LIMIT
+ 0, // OFFSET
+ new UnconstrainedAnswer() // GIVEN
+ ));
+
+ session.setAutoCommit(false);
+
+ answer.close();
+
+ session.commit();
+ session.setAutoCommit(true);
+ } finally {
+ session.close();
+ }
+ } catch (Exception e) {
+ fail(e);
+ }
+ }
+
+
public void testExplicitIsolationQuery() throws URISyntaxException {
logger.info("testExplicitIsolationQuery");
URI fileURI = new File("data/xatest-model1.rdf").toURI();
Modified: branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java
===================================================================
--- branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -365,14 +365,16 @@
acquireMutex();
try {
logger.debug("Transaction Complete");
- DatabaseSession session = sessionXAMap.get1(transaction);
- if (session == null) {
- throw new MulgaraTransactionException("No associated session found for transaction");
+ if (transaction == writeTransaction) {
+ DatabaseSession session = sessionXAMap.get1(transaction);
+ if (session == null) {
+ throw new MulgaraTransactionException("No associated session found for write transaction");
+ }
+ if (manager.isHoldingWriteLock(session)) {
+ manager.releaseWriteLock(session);
+ writeTransaction = null;
+ }
}
- if (manager.isHoldingWriteLock(session)) {
- manager.releaseWriteLock(session);
- writeTransaction = null;
- }
sessionXAMap.removeN(transaction);
activeTransactions.remove(Thread.currentThread());
Modified: branches/mgr-61-sparql/src/jar/server-http/build.xml
===================================================================
--- branches/mgr-61-sparql/src/jar/server-http/build.xml 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/server-http/build.xml 2008-04-25 22:50:58 UTC (rev 855)
@@ -150,7 +150,7 @@
<manifest file="${obj.dir}/META-INF/MANIFEST_Mulgara_HTTP_BOOTSTRAP.MF">
<attribute name="Main-Class" value="org.mulgara.util.Bootstrap"/>
- <attribute name="Embedded-Jar" value="lib/${driver.jar}, lib/${query.jar},lib/${itql.jar}, lib/${rules.jar}, lib/${server.jar}, lib/${util.jar}, lib/${config.jar}, lib/activation-1.0.2.jar, lib/icu4j.jar, lib/jena-2.1.jar,lib/antlr.jar, lib/${commons-logging.jar}, lib/log4j-1.2.15.jar, lib/mail-1.3.jar, lib/${jetty.jar},lib/${jetty.plus.jar}, lib/${jasper.runtime.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,lib/castor-0.9.3.9-xml.jar, lib/xercesImpl.jar, lib/xmlParserAPIs.jar, lib/${jrdf.jar},lib/jakarta-oro-2.0.5.jar, lib/${emory-util.jar}"/>
+ <attribute name="Embedded-Jar" value="lib/${driver.jar}, lib/${query.jar},lib/${itql.jar}, lib/${rules.jar}, lib/${server.jar}, lib/${util.jar}, lib/${config.jar}, lib/activation-1.0.2.jar, lib/icu4j.jar, lib/jena-2.1.jar,lib/antlr.jar, lib/${commons-logging.jar}, lib/log4j-1.2.15.jar, lib/mail-1.3.jar, lib/${jetty.jar},lib/${jetty.plus.jar}, lib/${jasper.runtime.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,lib/${castor-xml.jar}, lib/${castor-xml-schema.jar}, lib/xercesImpl.jar, lib/xmlParserAPIs.jar, lib/${jrdf.jar},lib/jakarta-oro-2.0.5.jar, lib/${emory-util.jar}"/>
<attribute name="Embedded-Main-Class" value="org.mulgara.server.EmbeddedMulgaraHttpServer"/>
</manifest>
Modified: branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/AbstractMulgaraResultSet.java
===================================================================
--- branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/AbstractMulgaraResultSet.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/AbstractMulgaraResultSet.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -69,6 +69,7 @@
/**
* Logger. This is named after the class.
*/
+ @SuppressWarnings("unused")
private final static Logger logger =
Logger.getLogger(AbstractMulgaraResultSet.class.getName());
@@ -224,11 +225,13 @@
}
/**
- * @param columnIndex PARAMETER TO DO
- * @param scale PARAMETER TO DO
+ * @param columnIndex The column number to retrieve
+ * @param scale The number of digits to the right of the decimal point
* @return The BigDecimal value
* @throws SQLException on failure
+ * @deprecated Deprecated in {@link java.sql.ResultSet}
*/
+ @SuppressWarnings("deprecation")
public BigDecimal getBigDecimal(int columnIndex, int scale)
throws SQLException {
@@ -288,10 +291,12 @@
}
/**
- * @param columnIndex PARAMETER TO DO
+ * @param columnIndex The column number to get data from
* @return The UnicodeStream value
* @throws SQLException on failure
+ * @deprecated Deprecated in the original {@link java.sql.ResultSet}
*/
+ @SuppressWarnings("deprecation")
public java.io.InputStream getUnicodeStream(int columnIndex)
throws SQLException {
@@ -436,11 +441,13 @@
}
/**
- * @param columnName PARAMETER TO DO
- * @param scale PARAMETER TO DO
+ * @param columnName The column containing a number
+ * @param scale Number of digits after the decimal point
* @return The BigDecimal value
* @throws SQLException on failure
+ * @deprecated Deprecated in the original {@link java.sql.ResultSet}
*/
+ @SuppressWarnings("deprecation")
public BigDecimal getBigDecimal(String columnName, int scale)
throws SQLException {
@@ -500,10 +507,12 @@
}
/**
- * @param columnName PARAMETER TO DO
+ * @param columnName The name of the column with the data to retrieve
* @return The UnicodeStream value
* @throws SQLException on failure
+ * @deprecated This has been deprecated in the original {@link ResultSet#getUnicodeStream(String)}
*/
+ @SuppressWarnings("deprecation")
public java.io.InputStream getUnicodeStream(String columnName)
throws SQLException {
@@ -701,6 +710,7 @@
* @return The Object value
* @throws SQLException on failure
*/
+ @SuppressWarnings("unchecked")
public Object getObject(int i, java.util.Map map) throws SQLException {
throw new SQLException(NOT_IMPLEMENTED);
@@ -752,6 +762,7 @@
* @return The Object value
* @throws SQLException on failure
*/
+ @SuppressWarnings("unchecked")
public Object getObject(String colName, java.util.Map map)
throws SQLException {
Modified: branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/MappedIntFile.java
===================================================================
--- branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/MappedIntFile.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/MappedIntFile.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -28,13 +28,20 @@
package org.mulgara.util;
// Java 2 standard packages
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.nio.IntBuffer;
+import java.nio.LongBuffer;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
-// Third party packages
import org.apache.log4j.Logger;
+import sun.misc.Cleaner;
+
/**
* @created 2003-01-09
*
@@ -299,6 +306,11 @@
*/
public synchronized void unmap() {
// Discard the file mappings.
+ if (mappedByteBuffers != null) {
+ for (MappedByteBuffer buffer : mappedByteBuffers) {
+ clean(buffer);
+ }
+ }
mappedByteBuffers = null;
intBuffers = null;
longBuffers = null;
@@ -379,5 +391,23 @@
nrMappedRegions = nrRegions;
}
+
+ private static void clean(final Object buffer) {
+ if (buffer != null) {
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run() {
+ try {
+ Method getCleanerMethod = buffer.getClass().getMethod("cleaner", new Class[0]);
+ getCleanerMethod.setAccessible(true);
+ Cleaner cleaner = (Cleaner)getCleanerMethod.invoke(buffer, new Object[0]);
+ cleaner.clean();
+ } catch (Exception e) {
+ logger.warn("Error cleaning buffer", e);
+ }
+ return null;
+ }
+ });
+ }
+ }
}
Modified: branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/MulgaraResultSet.java
===================================================================
--- branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/MulgaraResultSet.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/MulgaraResultSet.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -69,7 +69,7 @@
* @return the entire rows underlying the result set.
* @throws SQLException EXCEPTION TO DO
*/
- public List getAllRows() throws SQLException;
+ public List<ResultSetRow> getAllRows() throws SQLException;
/**
* Overwrites the existing set of rows available.
@@ -77,7 +77,7 @@
* @param newRows the new rows to set.
* @throws SQLException EXCEPTION TO DO
*/
- public void setAllRows(List newRows) throws SQLException;
+ public void setAllRows(List<ResultSetRow> newRows) throws SQLException;
/**
* Returns the total size of the number of rows.
Modified: branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/RowList.java
===================================================================
--- branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/RowList.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/RowList.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -51,7 +51,7 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public class RowList extends ArrayList {
+public class RowList<T> extends ArrayList<T> {
/**
* Allow newer compiled version of the stub to operate when changes
Modified: branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/TestResultSet.java
===================================================================
--- branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/TestResultSet.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/TestResultSet.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -85,7 +85,7 @@
/**
* The rows of the result set.
*/
- private List rows = new RowList();
+ private List<ResultSetRow> rows = new RowList<ResultSetRow>();
/**
* The current row index.
@@ -142,7 +142,6 @@
// Validate "resultSet" parameter
if (resultSet == null) {
-
throw new IllegalArgumentException("Null \"resultSet\" parameter");
}
@@ -151,10 +150,8 @@
// Copy rows
if (resultSet.getClass() == TestResultSet.class) {
-
rows.addAll( ( (TestResultSet) resultSet).rows);
- }
- else {
+ } else {
// Don't assume that it hasn't already been read.
resultSet.beforeFirst();
@@ -165,7 +162,6 @@
ResultSetRow row = new ResultSetRow(resultSet);
for (int i = 0; i < columnNames.length; i++) {
-
row.setObject(columnNames[i], resultSet.getObject(columnNames[i]));
}
@@ -180,8 +176,7 @@
* @param newRows the new rows to set.
* @throws SQLException EXCEPTION TO DO
*/
- public void setAllRows(List newRows) throws SQLException {
-
+ public void setAllRows(List<ResultSetRow> newRows) throws SQLException {
rows = newRows;
}
@@ -195,13 +190,9 @@
* @throws SQLException on failure
*/
public Object getObject(int columnIndex) throws SQLException {
-
// throw an error if the current row is invalid
- if (this.currentRow == null) {
+ if (this.currentRow == null) throw new SQLException("Not on a row.");
- throw new SQLException("Not on a row.");
- }
-
// get the value out of the current row
return this.currentRow.getObject(columnIndex);
}
@@ -218,11 +209,8 @@
public String getString(int columnIndex) throws SQLException {
// throw an error if the current row is invalid
- if (this.currentRow == null) {
+ if (this.currentRow == null) throw new SQLException("Not on a row.");
- throw new SQLException("Not on a row.");
- }
-
// get the value out of the current row
Object object = this.currentRow.getObject(columnIndex);
@@ -238,7 +226,6 @@
* @throws SQLException on failure
*/
public ResultSetMetaData getMetaData() throws SQLException {
-
return metaData;
}
@@ -250,7 +237,6 @@
* @throws SQLException on failure
*/
public boolean isBeforeFirst() throws SQLException {
-
return this.currentRowIndex == 0;
}
@@ -262,7 +248,6 @@
* @throws SQLException on failure
*/
public boolean isAfterLast() throws SQLException {
-
return this.currentRowIndex > this.rows.size();
}
@@ -273,7 +258,6 @@
* @throws SQLException on failure
*/
public boolean isFirst() throws SQLException {
-
return this.currentRowIndex == 1;
}
@@ -284,7 +268,6 @@
* @throws SQLException on failure
*/
public boolean isLast() throws SQLException {
-
return this.currentRowIndex == this.rows.size();
}
@@ -294,8 +277,7 @@
* @return the entire rows underlying the result set.
* @throws SQLException EXCEPTION TO DO
*/
- public List getAllRows() throws SQLException {
-
+ public List<ResultSetRow> getAllRows() throws SQLException {
return rows;
}
@@ -306,7 +288,6 @@
* @throws SQLException on failure
*/
public int getRow() throws SQLException {
-
return this.currentRowIndex;
}
@@ -316,7 +297,6 @@
* @return the total size of the number of rows available.
*/
public int getTotalRowSize() {
-
return rows.size();
}
@@ -326,7 +306,6 @@
* @return The CurrentRow value
*/
public ResultSetRow getCurrentRow() {
-
return currentRow;
}
@@ -342,7 +321,6 @@
* @throws SQLException on failure
*/
public boolean next() throws SQLException {
-
boolean returnState = false;
// advance the cursor if we can
@@ -351,8 +329,7 @@
this.currentRowIndex++;
this.currentRow = (ResultSetRow)this.rows.get(this.currentRowIndex - 1);
returnState = true;
- }
- else {
+ } else {
this.currentRow = null;
returnState = false;
@@ -369,7 +346,6 @@
* @throws SQLException on failure
*/
public void beforeFirst() throws SQLException {
-
// return members to their default state
this.currentRowIndex = 0;
this.currentRow = null;
@@ -381,7 +357,6 @@
* @throws SQLException on failure
*/
public void afterLast() throws SQLException {
-
this.currentRowIndex = this.rows.size() + 1;
this.currentRow = null;
}
@@ -389,7 +364,7 @@
/**
* Moves the cursor to the first row in this ResultSet object.
*
- * @return true if the cursor is on a valid row; false if there are no rows in
+ * @return true if the cursor is on a valid row; false if there are no rows in
* the result set
* @throws SQLException always
*/
@@ -398,7 +373,6 @@
boolean returnState = false;
if (this.rows.size() > 0) {
-
this.beforeFirst();
this.next();
returnState = true;
@@ -418,7 +392,6 @@
boolean returnState = false;
if ( (this.rows != null) && (this.rows.size() > 0)) {
-
this.currentRowIndex = this.rows.size();
this.currentRow = (ResultSetRow)this.rows.get(this.currentRowIndex - 1);
returnState = true;
@@ -433,7 +406,6 @@
* @param row new row to add to the end of the queue.
*/
public void addRow(ResultSetRow row) {
-
rows.add(row);
}
@@ -445,7 +417,7 @@
*
* @param row the number of the row to which the cursor should move. A
* positive number indicates the row number counting from the beginning
- * of the result set; a negative number indicates the row number counting
+ * of the result set; a negative number indicates the row number counting
* from the end of the result set
* @return RETURNED VALUE TO DO
* @throws SQLException on failure
@@ -458,34 +430,21 @@
if (row >= 0) {
if (row == 0) {
-
beforeFirst();
- }
- else if (row <= this.rows.size()) {
-
+ } else if (row <= this.rows.size()) {
this.currentRowIndex = row;
- this.currentRow =
- (ResultSetRow)this.rows.get(this.currentRowIndex - 1);
+ this.currentRow = this.rows.get(this.currentRowIndex - 1);
returnState = true;
- }
- else {
-
+ } else {
afterLast();
}
- }
-
- // Work back from the end
- else {
-
+ } else {
+ // Work back from the end
if ( (this.rows.size() + row) >= 0) {
-
this.currentRowIndex = (this.rows.size() + 1) + row;
- this.currentRow =
- (ResultSetRow)this.rows.get(this.currentRowIndex - 1);
+ this.currentRow = this.rows.get(this.currentRowIndex - 1);
returnState = true;
- }
- else {
-
+ } else {
beforeFirst();
}
}
@@ -518,26 +477,19 @@
this.currentRow =
(ResultSetRow)this.rows.get(this.currentRowIndex - 1);
returnState = true;
- }
- else {
-
+ } else {
afterLast();
}
- }
+ } else {
+ // Work back from the end
- // Work back from the end
- else {
-
if ( (this.currentRowIndex + numRows) > 0) {
// Add 1 to size to go to end of list then add the negative row number
this.currentRowIndex += numRows;
- this.currentRow =
- (ResultSetRow)this.rows.get(this.currentRowIndex - 1);
+ this.currentRow = this.rows.get(this.currentRowIndex - 1);
returnState = true;
- }
- else {
-
+ } else {
beforeFirst();
}
}
@@ -550,391 +502,6 @@
//
/**
- * Perform a <dfn>natural join</dfn> between this result set and another. The
- * join will be performed based on matching column names. See Elmasri &
- * Navathe, <cite>Fundamentals of Database Systems</cite> , p. 158.
- *
- * @param resultSet the other result set to join with
- * @return the result of the join operation
- * @throws SQLException if the join fails
- */
- /*
- public MulgaraResultSet join(MulgaraResultSet resultSet) throws SQLException {
-
- // Determine the join variables
- List columnNamesList = new ArrayList(Arrays.asList(columnNames));
-
- String[] mdataColumnNames = resultSet.getColumnNames();
-
- columnNamesList.remove("score");
-
- // FIXME: hack for Lucene queries
- columnNamesList.retainAll(Arrays.asList(mdataColumnNames));
-
- // Delegate execution to the fully parameterized join method
- String[] columnNamesArray =
- (String[]) columnNamesList.toArray(new String[columnNamesList.size()]);
-
- return join(resultSet, columnNamesArray, columnNamesArray);
- }
- */
-
- /**
- * Perform a natural join between this result set and another, specifying the
- * column names upon which to join.
- *
- * @param resultSet the other result set to join with
- * @param columnNames the list of column names in <code>this</code> on which
- * to join; all the named columns must occur in <code>this</code>, and
- * the length of the array must match <var>resultSetColumnNames</var>
- * @param resultSetColumnNames the list of column names in <var>resultSet
- * </var> on which to join; all the named columns must occur in <var>
- * resultSet</var> , and the length of the array must match <var>
- * columnNames</var>
- * @return the result of the join operation
- * @throws IllegalArgumentException if the <var>columnName</var> and <var>
- * resultSetColumnNames</var> arguments are incompatible, or if any of
- * the arguments are <code>null</code>
- * @throws SQLException if the join fails
- */
- /*
- public MulgaraResultSet join(MulgaraResultSet resultSet, String[] columnNames,
- String[] resultSetColumnNames) throws SQLException {
-
- // Validate parameters
- if (columnNames.length != resultSetColumnNames.length) {
-
- throw new IllegalArgumentException(
- "columnNames different length than resultSetColumnNames");
- }
-
- MulgaraResultSet testResultSet = new TestResultSet(resultSet);
-
- // Calculate unjoined columns of this and resultSet
- List unjoinedColumnNamesList =
- new ArrayList(Arrays.asList(this.columnNames));
- unjoinedColumnNamesList.removeAll(Arrays.asList(columnNames));
-
- String[] mdColumnNames = testResultSet.getColumnNames();
- List unjoinedResultSetColumnNamesList =
- new ArrayList(Arrays.asList(mdColumnNames));
- unjoinedResultSetColumnNamesList.removeAll(Arrays.asList(columnNames));
-
- List resultColumnNamesList = new ArrayList(Arrays.asList(columnNames));
- resultColumnNamesList.addAll(unjoinedColumnNamesList);
- resultColumnNamesList.addAll(unjoinedResultSetColumnNamesList);
-
- String[] resultColumnNames =
- (String[]) resultColumnNamesList.toArray(new String[
- resultColumnNamesList.size()]);
-
- TestResultSet result = new TestResultSet(resultColumnNames);
-
- // Pre-calculate column numbers for the columnNames array
- int[] columnIndices = new int[columnNames.length];
-
- for (int i = 0; i < columnNames.length; i++) {
-
- columnIndices[i] = columnForName(columnNames[i]);
- }
-
- int[] resultSetColumnIndices = new int[columnNames.length];
-
- for (int i = 0; i < columnNames.length; i++) {
-
- resultSetColumnIndices[i] =
- ( (TestResultSet) resultSet).columnForName(columnNames[i]);
- }
-
- // Short-circuit execution if the join is going to be empty
- if ( (getTotalRowSize() == 0) || (testResultSet.getTotalRowSize() == 0)) {
-
- return result;
- }
-
- if ( (columnNames.length == 0) &&
- logger.isEnabledFor(org.apache.log4j.Priority.WARN) &&
- (getTotalRowSize() > 1) &&
- (testResultSet.getTotalRowSize() > 1)) {
-
- logger.warn("Performing cartesian product (" + rows.size() + "x" +
- testResultSet.getTotalRowSize() + ")");
- }
-
- // Iterate through the joined columns
- while (next()) {
-
- ResultSetRow lhsRow = (ResultSetRow) getCurrentRow();
-
- rhs:
- for (testResultSet.beforeFirst(); testResultSet.next(); ) {
-
- ResultSetRow rhsRow = (ResultSetRow) testResultSet.getCurrentRow();
-
- // Don't create the new row unless the equijoin test succeeds
- for (int i = 0; i < columnNames.length; i++) {
-
- Object lhsObject = lhsRow.getObject(columnIndices[i]);
- Object rhsObject = rhsRow.getObject(resultSetColumnNames[i]);
-
- // Nulls are always equal; other values must be tested
- if ( (lhsObject != null) &&
- (rhsObject != null) &&
- !lhsObject.equals(rhsObject)) {
-
- continue rhs;
- }
- }
-
- // equijoin succeeded
- // Creating a new row
- ResultSetRow resultRow = new ResultSetRow(result);
-
- // Set all the join columns
- for (int i = 0; i < columnNames.length; i++) {
-
- Object lhsValue = lhsRow.getObject(columnIndices[i]);
- Object rhsValue = rhsRow.getObject(resultSetColumnIndices[i]);
- resultRow.setObject(columnNames[i],
- (lhsValue == null) ? rhsValue : lhsValue);
- }
-
- // Set all unjoined LHS columns
- for (Iterator i = unjoinedColumnNamesList.iterator(); i.hasNext(); ) {
-
- String ucn = (String) i.next();
- resultRow.setObject(ucn, lhsRow.getObject(ucn));
- }
-
- // Set all unjoined RHS columns
- for (Iterator i = unjoinedResultSetColumnNamesList.iterator();
- i.hasNext(); ) {
-
- String ucn = (String) i.next();
- resultRow.setObject(ucn, rhsRow.getObject(ucn));
- }
-
- result.addRow(resultRow);
- }
- }
-
- // Not sure what to do here yet
- return result;
- }
- */
-
- /**
- * Perform a relational algebra <dfn>self join</dfn> operation. This operation
- * filters duplicate rows out of result sets. In this implementation, order is
- * not preserved.
- *
- */
- /*
- public void removeDuplicateRows() {
-
- // Sort the result sets
- List sortedRows = new RowList(rows.size());
- sortedRows.addAll(rows);
- Collections.sort(sortedRows, this.new ColumnComparator(columnNames));
-
- // Remove duplicates
- ResultSetRow previousRow = null;
- row:
- for (Iterator i = sortedRows.iterator(); i.hasNext(); ) {
-
- ResultSetRow row = (ResultSetRow) i.next();
-
- if (previousRow == null) {
-
- previousRow = row;
- }
- else {
-
- for (int j = 0; j < columnNames.length; j++) {
-
- Object previousField = previousRow.getObject(columnNames[j]);
- Object field = row.getObject(columnNames[j]);
-
- if ( (previousField != null) && !previousField.equals(field)) {
-
- previousRow = row;
-
- continue row;
- }
- }
-
- // The current element is a duplicate of the previous one; remove it
- i.remove();
- }
- }
-
- // New rows are the ones without duplicates
- rows = sortedRows;
- }
- */
-
- /**
- * Perform a relational algebra <dfn>project</dfn> operation. This operation
- * filters columns out of result sets. The columns to be retained are
- * specified by name.
- *
- * @param columnNames the column names to retain, which may or may not exist
- * in this result set
- * @return a result set containing only columns named in <code>columnNames</code>
- * @throws SQLException if the projection fails
- */
- /*
- public MulgaraResultSet project2(String[] columnNames) throws SQLException {
-
- // Intersect the projection variables
- List columnNamesList = new ArrayList(Arrays.asList(columnNames));
- columnNamesList.retainAll(Arrays.asList(this.columnNames));
-
- String[] projectedColumnNames = new String[columnNamesList.size()];
- projectedColumnNames =
- (String[]) columnNamesList.toArray(projectedColumnNames);
-
- TestResultSet result = new TestResultSet(projectedColumnNames);
-
- // Start at the start
- beforeFirst();
-
- while (next()) {
-
- ResultSetRow row = getCurrentRow();
-
- // Create the new row
- ResultSetRow resultRow = new ResultSetRow(result);
-
- // Populate each column of the new row
- for (int j = 0; j < projectedColumnNames.length; j++) {
-
- resultRow.setObject(projectedColumnNames[j],
- row.getObject(projectedColumnNames[j]));
- }
-
- // Add the new row to the result
- result.addRow(resultRow);
- }
-
- return result;
- }
- */
-
- /**
- * Perform a relational algebra <dfn>project</dfn> operation. This operation
- * filters columns out of result sets. The columns to be retained are
- * specified by name.
- *
- * @param columnNames the column names to retain, all of which must exist in
- * this result set
- * @return a result set containing only columns named in <code>columnNames</code>
- * @throws SQLException if the projection fails
- */
- /*
- public MulgaraResultSet project(String[] columnNames) throws SQLException {
-
- TestResultSet result = new TestResultSet(columnNames);
-
- // Start at the start
- beforeFirst();
-
- while (next()) {
-
- ResultSetRow row = (ResultSetRow) getCurrentRow();
-
- // Create the new row
- ResultSetRow resultRow = new ResultSetRow(result);
-
- // Populate each column of the new row
- for (int j = 0; j < columnNames.length; j++) {
-
- resultRow.setObject(columnNames[j], row.getObject(columnNames[j]));
- }
-
- // Add the new row to the result
- result.addRow(resultRow);
- }
-
- return result;
- }
- */
-
- /**
- * Sort according to a passed comparator.
- *
- * @param comparator a comparator for {@link ResultSetRow}s
- */
- /*
- public void sort(Comparator comparator) {
-
- if (comparator == null) {
-
- throw new IllegalArgumentException("Null \"comparator\" parameter");
- }
-
- Collections.sort(rows, comparator);
- }
- */
-
- //
- // Utility methods to make testing possible
- //
-
- /**
- * Append all rows from another result set to this one. All the column names
- * in this result set must be present in the other. This implementation
- * doesn't require that the types of the columns match.
- *
- * @param resultSet the result set to append
- * @throws SQLException if <var>resultSet</var> can't be read
- */
-
- // FIXME: I modify my argument by moving its cursor all over the place,
- // and I assume that the cursor starts at the beginning
- /*
- public void append(ResultSet resultSet) throws SQLException {
-
- // Short-circuit test
- if (resultSet == null) {
-
- return;
- }
-
- ;
-
- // Quick hack to avoid infinite looping or cursor side effects
- resultSet = new TestResultSet(resultSet);
-
- // Add all rows in resultSet to this
- resultSet.beforeFirst();
-
- while (resultSet.next()) {
-
- // Create the new row
- ResultSetRow row = new ResultSetRow(this);
- this.addRow(row);
-
- // Populate each column of the new row
- for (int i = 0; i < columnNames.length; i++) {
-
- // Hack to skip columns missing from resultSet
- try {
-
- resultSet.findColumn(columnNames[i]);
- }
- catch (SQLException e) {
-
- continue;
- }
-
- row.setObject(columnNames[i], resultSet.getObject(columnNames[i]));
- }
- }
- }
- */
-
- /**
* Result sets are equal if their rows are equal. Both row and column ordering
* is signicant.
*
@@ -943,11 +510,8 @@
*/
public boolean equals(Object object) {
- if (! (object instanceof ResultSet)) {
+ if (! (object instanceof ResultSet)) return false;
- return false;
- }
-
try {
// Convert the other result set into a comparable form
@@ -957,54 +521,12 @@
// Compare the rows
return rows.equals(testResultSet.rows);
- }
- catch (SQLException e) {
-
+ } catch (SQLException e) {
return false;
}
}
/**
- * Test this result set for equality with another, ignoring any differences
- * between row ordering. Column ordering is still significant.
- *
- * @param object the result set to check to see if it is equal.
- * @return true if the result set is equal ignoring row order.
- */
- /*
- public boolean equalsIgnoreOrder(Object object) {
-
- if (! (object instanceof ResultSet)) {
-
- return false;
- }
-
- try {
-
- // Convert the other result set into a comparable form
- TestResultSet testResultSet =
- (object instanceof TestResultSet) ? (TestResultSet) object
- : new TestResultSet( (ResultSet) object);
-
- // Sort the result sets and compare the sorted rows
- List sortedRows = new ArrayList(rows.size());
- sortedRows.addAll(rows);
- Collections.sort(sortedRows);
-
- List sortedTestResultSetRows = new ArrayList(testResultSet.rows.size());
- sortedTestResultSetRows.addAll(testResultSet.rows);
- Collections.sort(sortedTestResultSetRows);
-
- return sortedRows.equals(sortedTestResultSetRows);
- }
- catch (SQLException e) {
-
- return false;
- }
- }
- */
-
- /**
* Produce a string version of the result set. Displaying the available
* columns and rows.
*
@@ -1014,28 +536,22 @@
try {
- StringBuffer buffer =
- new StringBuffer(getColumnNames().length + " columns:");
+ StringBuffer buffer = new StringBuffer(getColumnNames().length + " columns:");
// Save the current state of the result set.
int tmpCurrentRow = getRow();
// Get the names of the columns
for (int i = 0; i < columnNames.length; i++) {
-
buffer.append(" ").append(columnNames[i]);
}
buffer.append(" (").append(rows.size()).append(" rows)");
- // Save the current state
- int currentRowIndex = getRow();
-
// Start at the start
beforeFirst();
while (next()) {
-
buffer.append("\n").append(getCurrentRow());
}
@@ -1043,81 +559,24 @@
absolute(tmpCurrentRow);
return buffer.toString();
- }
- catch (SQLException se) {
-
+ } catch (SQLException se) {
logger.error("Failed to convert object to string", se);
-
return "";
}
}
/**
- * Truncate trailing rows.
- *
- * @param limit the maximum number of rows to retain
- */
- /*
- public void limit(int limit) {
-
- if (rows.size() > limit) {
-
- logger.warn("Removing " + limit + "-" + rows.size());
- ( (RowList) rows).removeRange(limit, rows.size());
-
- // probably should validate currentRowIndex
- }
- }
- */
-
- /**
- * Truncate leading rows.
- *
- * @param offset the number of leading rows to truncate
- */
- /*
- public void offset(int offset) {
-
- if (offset == 0) {
-
- // do nothing
- }
- else if (offset < rows.size()) {
-
- logger.warn("Removing 0-" + offset);
- ( (RowList) rows).removeRange(0, offset);
- currentRowIndex -= offset;
-
- if (currentRowIndex < 0) {
-
- currentRowIndex = 0;
- }
- }
- else if (offset >= rows.size()) {
-
- rows.clear();
- }
- else {
-
- throw new IllegalArgumentException("Illegal offset: " + offset);
- }
- }
- */
-
- /**
* Initialises the column names and metadata from the given metadata object.
*
* @param newMetaData PARAMETER TO DO
* @throws SQLException if there was an error getting the metadata attributes.
*/
- private void initialiseMetaData(ResultSetMetaData newMetaData) throws
- SQLException {
+ private void initialiseMetaData(ResultSetMetaData newMetaData) throws SQLException {
int columnNameCount = newMetaData.getColumnCount();
columnNames = new String[columnNameCount];
for (int i = 0; i < columnNameCount; i++) {
-
columnNames[i] = newMetaData.getColumnName(i + 1);
}
@@ -1126,190 +585,139 @@
}
public int getHoldability() throws SQLException {
- // TODO Auto-generated method stub
- return 0;
+ throw new SQLException(NOT_IMPLEMENTED);
}
public Reader getNCharacterStream(int columnIndex) throws SQLException {
- // TODO Auto-generated method stub
- return null;
+ throw new SQLException(NOT_IMPLEMENTED);
}
public Reader getNCharacterStream(String columnLabel) throws SQLException {
- // TODO Auto-generated method stub
- return null;
+ throw new SQLException(NOT_IMPLEMENTED);
}
public NClob getNClob(int columnIndex) throws SQLException {
- // TODO Auto-generated method stub
- return null;
+ throw new SQLException(NOT_IMPLEMENTED);
}
public NClob getNClob(String columnLabel) throws SQLException {
- // TODO Auto-generated method stub
- return null;
+ throw new SQLException(NOT_IMPLEMENTED);
}
public String getNString(int columnIndex) throws SQLException {
- // TODO Auto-generated method stub
- return null;
+ throw new SQLException(NOT_IMPLEMENTED);
}
public String getNString(String columnLabel) throws SQLException {
- // TODO Auto-generated method stub
- return null;
+ throw new SQLException(NOT_IMPLEMENTED);
}
public RowId getRowId(int columnIndex) throws SQLException {
- // TODO Auto-generated method stub
- return null;
+ throw new SQLException(NOT_IMPLEMENTED);
}
public RowId getRowId(String columnLabel) throws SQLException {
- // TODO Auto-generated method stub
- return null;
+ throw new SQLException(NOT_IMPLEMENTED);
}
public SQLXML getSQLXML(int columnIndex) throws SQLException {
- // TODO Auto-generated method stub
- return null;
+ throw new SQLException(NOT_IMPLEMENTED);
}
public SQLXML getSQLXML(String columnLabel) throws SQLException {
- // TODO Auto-generated method stub
- return null;
+ throw new SQLException(NOT_IMPLEMENTED);
}
public boolean isClosed() throws SQLException {
- // TODO Auto-generated method stub
- return false;
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateAsciiStream(int columnIndex, InputStream x, long length)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateAsciiStream(String columnLabel, InputStream x, long length)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateBinaryStream(int columnIndex, InputStream x, long length)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateBinaryStream(String columnLabel, InputStream x, long length)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateBlob(int columnIndex, InputStream inputStream, long length)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateBlob(String columnLabel, InputStream inputStream,
- long length) throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateCharacterStream(int columnIndex, Reader x, long length)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateCharacterStream(String columnLabel, Reader reader,
- long length) throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateClob(int columnIndex, Reader reader, long length)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateClob(String columnLabel, Reader reader, long length)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateNCharacterStream(int columnIndex, Reader x, long length)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateNCharacterStream(String columnLabel, Reader reader,
- long length) throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
public void updateNClob(int columnIndex, NClob clob) throws SQLException {
- // TODO Auto-generated method stub
-
+ throw new SQLException(NOT_IMPLEMENTED);
}
public void updateNClob(String columnLabel, NClob clob) throws SQLException {
- // TODO Auto-generated method stub
-
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateNClob(int columnIndex, Reader reader, long length)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateNClob(String columnLabel, Reader reader, long length)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
public void updateNString(int columnIndex, String string) throws SQLException {
- // TODO Auto-generated method stub
-
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateNString(String columnLabel, String string)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateNString(String columnLabel, String string) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
public void updateRowId(int columnIndex, RowId x) throws SQLException {
- // TODO Auto-generated method stub
-
+ throw new SQLException(NOT_IMPLEMENTED);
}
public void updateRowId(String columnLabel, RowId x) throws SQLException {
- // TODO Auto-generated method stub
-
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateSQLXML(int columnIndex, SQLXML xmlObject)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
- public void updateSQLXML(String columnLabel, SQLXML xmlObject)
- throws SQLException {
- // TODO Auto-generated method stub
-
+ public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
+ throw new SQLException(NOT_IMPLEMENTED);
}
public void updateNCharacterStream(int columnIndex, Reader reader) throws SQLException {
@@ -1369,123 +777,11 @@
}
public boolean isWrapperFor(Class<?> iface) throws SQLException {
- // TODO Auto-generated method stub
- return false;
+ throw new SQLException(NOT_IMPLEMENTED);
}
public <T> T unwrap(Class<T> iface) throws SQLException {
- // TODO Auto-generated method stub
- return null;
+ throw new SQLException(NOT_IMPLEMENTED);
}
- /**
- * Comparator class used by the
- * {@link #join(MulgaraResultSet, String[], String[])} method.
- */
- //class ColumnComparator implements Comparator {
-
- /**
- * The columns to sort by, 0-indexed.
- *
- */
- //private String[] columnNames;
-
- /**
- * @param columnNames the names of the columns to use as a sort order
- */
- /*
- public ColumnComparator(String[] columnNames) {
-
- // Validate columnNames2
- if (columnNames == null) {
-
- throw new IllegalArgumentException("Null columnNames parameter");
- }
-
- // Initialize fields
- this.columnNames = columnNames;
- }
-
- public int compare(Object a, Object b) {
-
- // Validate parameters
- if (! (a instanceof ResultSetRow && b instanceof ResultSetRow)) {
-
- throw new RuntimeException("Can't compare " + a.getClass() + " to " +
- b.getClass());
- }
-
- // Delegate execution to private, type-specific method
- return compare( (ResultSetRow) a, (ResultSetRow) b);
- }
- */
-
- /**
- * Ordering on {@link ResultSetRow}s. The ordering is by the {@link
- * Object#toString} value of the fields, earlier columns having higher
- * precedence and <code>null</code> ordering before all other field values.
- *
- * @param a PARAMETER TO DO
- * @param b PARAMETER TO DO
- * @return RETURNED VALUE TO DO
- * @deprecated Ordering by {@link Object#toString} value is a terrible idea.
- */
- /*
- private int compare(ResultSetRow a, ResultSetRow b) {
-
- // Compare each column in turn, returning an ordering if they're unequal
- for (int i = 0; i < columnNames.length; i++) {
-
- Object a2 = a.getObject(columnNames[i]);
- Object b2 = b.getObject(columnNames[i]);
-
- // Handle null comparisons
- if ( (a2 == null) && (b2 == null)) {
-
- continue;
- }
-
- // A = B
- if (a2 == null) {
-
- return -1;
- }
-
- // A < B
- if (b2 == null) {
-
- return +1;
- }
-
- // A > B
- // Handle non-null comparisons
- int difference;
-
- if (a2 instanceof Comparable) {
-
- difference = ( (Comparable) a2).compareTo(b2);
- }
- else {
-
- if (logger.isDebugEnabled()) {
-
- logger.debug("Falling back to lexical comparison for " +
- a2.getClass());
- }
-
- difference = a2.toString().compareTo(b2.toString());
- }
-
- // Return if an order has been established
- if (difference != 0) {
-
- return difference;
- }
- }
-
- // The rows must be equal (insofar as the named columns go)
- return 0;
- }
- */
- //}
}
Modified: branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/TestResultSetTest.java
===================================================================
--- branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/TestResultSetTest.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/TestResultSetTest.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -32,7 +32,7 @@
// Java 2 standard packages
import java.sql.SQLException;
-import java.util.*;
+// import java.util.*;
// JUnit
import org.apache.log4j.Logger;
@@ -54,17 +54,12 @@
*/
public class TestResultSetTest extends TestCase {
- /**
- * Logger. Named after the class.
- *
- */
+ /** Logger. Named after the class. */
+ @SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(TestResultSetTest.class);
- /**
- * Test object.
- *
- */
- private TestResultSet testResultSet;
+ /** Test object. */
+// private TestResultSet testResultSet;
/**
* CONSTRUCTOR TestResultSetTest TO DO
Modified: branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/UIDGeneratorUnitTest.java
===================================================================
--- branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/UIDGeneratorUnitTest.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/util/java/org/mulgara/util/UIDGeneratorUnitTest.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -59,7 +59,7 @@
public class UIDGeneratorUnitTest extends TestCase {
/** Set of UIDs that have been generated */
- private Set uids = null;
+ private Set<String> uids = null;
/** Number of UIDs generated */
private static final int NUM_UIDS = 10000;
@@ -143,7 +143,7 @@
public void testConcurrency() throws Exception {
//threads that have to complete before the test finished
- List threadList = new ArrayList();
+ List<Thread> threadList = new ArrayList<Thread>();
Thread currentThread = null;
//start threads that generate UIDs
@@ -167,8 +167,7 @@
uids.add(currentUID);
}
}
- }
- catch (Exception exception) {
+ } catch (Exception exception) {
throw new RuntimeException(
"Error occurred while testing concurrency.",
exception);
@@ -187,7 +186,7 @@
//must wait for all threads to finish
for (int i = 0; i < NUM_THREADS; i++) {
- ((Thread) threadList.get(i)).join();
+ threadList.get(i).join();
}
}
@@ -201,7 +200,7 @@
//load UIDGenerator from multiple classes
URLClassLoader currentLoader = null;
- Class currentUIDGeneratorClass = null;
+ Class<?> currentUIDGeneratorClass = null;
//get an URL to the UIDGenerator class file
URL[] uidClass = new URL[] {
@@ -222,12 +221,12 @@
* @param uidGenerator
* @throws Exception
*/
- private void testUIDGeneratorClass(Class uidGenerator) throws Exception {
+ private void testUIDGeneratorClass(Class<?> uidGenerator) throws Exception {
//get the UIDGenerator's generateUID method
- Method generateUID = uidGenerator.getMethod("generateUID", null);
+ Method generateUID = uidGenerator.getMethod("generateUID", (Class[])null);
String currentUID = "";
for (int i = 0; i < NUM_UIDS; i++) {
- currentUID = (String) generateUID.invoke(null, null);
+ currentUID = (String) generateUID.invoke(null, (Object[])null);
//is it unique??
if (uids.contains(currentUID)) {
fail("UID set already contains UID [" + i + "]: " + currentUID);
@@ -248,11 +247,10 @@
try {
- uids = new HashSet();
+ uids = new HashSet<String>();
super.setUp();
- }
- catch (Exception exception) {
+ } catch (Exception exception) {
//try to tear down first
tearDown();
Modified: branches/mgr-61-sparql/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFile.java
===================================================================
--- branches/mgr-61-sparql/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFile.java 2008-04-25 04:16:48 UTC (rev 854)
+++ branches/mgr-61-sparql/src/jar/util-xa/java/org/mulgara/store/xa/MappedBlockFile.java 2008-04-25 22:50:58 UTC (rev 855)
@@ -29,12 +29,17 @@
// Java 2 standard packages
import java.io.*;
+import java.lang.reflect.Method;
import java.nio.*;
import java.nio.channels.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
// Third party packages
import org.apache.log4j.Logger;
+import sun.misc.Cleaner;
+
/**
* An implementation of BlockFile which uses memory mapped file IO.
* Rather than mapping the entire file in one go, it gets mapped into
@@ -334,6 +339,12 @@
*/
public synchronized void unmap() {
// Discard the file mappings.
+ if (mappedByteBuffers != null) {
+ for (MappedByteBuffer buffer : mappedByteBuffers) {
+ clean(buffer);
+ }
+ }
+
mappedByteBuffers = null;
srcByteBuffers = null;
intBuffers = null;
@@ -461,5 +472,23 @@
nrMappedRegions = nrRegions;
}
+
+ private static void clean(final Object buffer) {
+ if (buffer != null) {
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run() {
+ try {
+ Method getCleanerMethod = buffer.getClass().getMethod("cleaner", new Class[0]);
+ getCleanerMethod.setAccessible(true);
+ Cleaner cleaner = (Cleaner)getCleanerMethod.invoke(buffer, new Object[0]);
+ cleaner.clean();
+ } catch (Exception e) {
+ logger.warn("Error cleaning buffer", e);
+ }
+ return null;
+ }
+ });
+ }
+ }
}
More information about the Mulgara-svn
mailing list