Tue Feb 26 05:34:44 UTC 2008

Author: pag
Date: 2008-02-25 21:34:43 -0800 (Mon, 25 Feb 2008)
New Revision: 658

Added:
   trunk/src/jar/query/java/org/mulgara/connection/CommandExecutor.java
Modified:
   trunk/jxdata/iTQL/backup_restore/backup1Result3.txt
   trunk/jxdata/iTQL/backup_restore/result3.txt
   trunk/jxdata/iTQL/create_drop/queryResult3.txt
   trunk/jxdata/iTQL/create_drop/queryResult5.txt
   trunk/jxdata/iTQL/data_types/binary/base64Binary/result1.txt
   trunk/jxdata/iTQL/data_types/binary/hexBinary/result1.txt
   trunk/jxdata/iTQL/data_types/boolean/result1.txt
   trunk/jxdata/iTQL/data_types/gDates/result1.txt
   trunk/jxdata/iTQL/data_types/queryResult37.txt
   trunk/jxdata/iTQL/data_types/result1.txt
   trunk/jxdata/iTQL/filesystem/queryResult10.txt
   trunk/jxdata/iTQL/filesystem/queryResult11.txt
   trunk/jxdata/iTQL/filesystem/queryResult12.txt
   trunk/jxdata/iTQL/filesystem/queryResult8.txt
   trunk/jxdata/iTQL/filesystem/queryResult9.txt
   trunk/jxdata/iTQL/filesystem/result1.txt
   trunk/jxdata/iTQL/fulltext_queries/drop1.txt
   trunk/jxdata/iTQL/fulltext_queries/queryResult8.txt
   trunk/jxdata/iTQL/fulltext_queries/result2.txt
   trunk/jxdata/iTQL/fulltext_queries/result3.txt
   trunk/jxdata/iTQL/fulltext_queries/result5.txt
   trunk/jxdata/iTQL/fulltext_queries/result7.txt
   trunk/jxdata/iTQL/insert/queryResult1.txt
   trunk/jxdata/iTQL/node_types/result1.txt
   trunk/jxdata/iTQL/prefix/result1.txt
   trunk/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/configResult.txt
   trunk/jxdata/iTQL/rdfs/rdfs-domain-and-range/configResult.txt
   trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/configResult.txt
   trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/configResult.txt
   trunk/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/configResult.txt
   trunk/jxdata/iTQL/rdfs/statement-entailment/configResult.txt
   trunk/jxdata/iTQL/transactions/queryResult6.txt
   trunk/jxdata/iTQL/transactions/queryResult7.txt
   trunk/jxdata/iTQL/transactions/queryResult8.txt
   trunk/jxdata/iTQL/transactions/queryResult9.txt
   trunk/src/jar/ant-task/java/org/mulgara/ant/task/rdf/RDFLoad.java
   trunk/src/jar/itql/java/org/mulgara/itql/Collaborator.java
   trunk/src/jar/query/java/org/mulgara/connection/Connection.java
   trunk/src/jar/query/java/org/mulgara/connection/DummyConnection.java
   trunk/src/jar/query/java/org/mulgara/connection/SessionConnection.java
   trunk/src/jar/query/java/org/mulgara/query/operation/AddAlias.java
   trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java
   trunk/src/jar/query/java/org/mulgara/query/operation/Deletion.java
   trunk/src/jar/query/java/org/mulgara/query/operation/DropGraph.java
   trunk/src/jar/query/java/org/mulgara/query/operation/Help.java
   trunk/src/jar/query/java/org/mulgara/query/operation/Insertion.java
   trunk/src/jar/query/java/org/mulgara/query/operation/Load.java
   trunk/src/jar/query/java/org/mulgara/query/operation/NullOp.java
   trunk/src/jar/query/java/org/mulgara/query/operation/Quit.java
   trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java
   trunk/src/jar/query/java/org/mulgara/query/operation/SetTime.java
   trunk/src/jar/query/java/org/mulgara/query/operation/SetUser.java
Log:
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

Modified: trunk/jxdata/iTQL/backup_restore/backup1Result3.txt
===================================================================

--- trunk/jxdata/iTQL/backup_restore/backup1Result3.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/backup_restore/backup1Result3.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully dropped model @server@#xsdmodel</message></query><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully dropped graph @server@#xsdmodel</message></query><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>

Modified: trunk/jxdata/iTQL/backup_restore/result3.txt
===================================================================
--- trunk/jxdata/iTQL/backup_restore/result3.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/backup_restore/result3.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully dropped model @server@#xsdmodel</message></query><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully dropped graph @server@#xsdmodel</message></query><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>

Modified: trunk/jxdata/iTQL/create_drop/queryResult3.txt
===================================================================
--- trunk/jxdata/iTQL/create_drop/queryResult3.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/create_drop/queryResult3.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped model @server@#vcard2</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped graph @server@#vcard2</message></query></answer>

Modified: trunk/jxdata/iTQL/create_drop/queryResult5.txt
===================================================================
--- trunk/jxdata/iTQL/create_drop/queryResult5.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/create_drop/queryResult5.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped model @server@#vcard1</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped graph @server@#vcard1</message></query></answer>

Modified: trunk/jxdata/iTQL/data_types/binary/base64Binary/result1.txt
===================================================================
--- trunk/jxdata/iTQL/data_types/binary/base64Binary/result1.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/data_types/binary/base64Binary/result1.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully dropped model @server@#xsdmodel</message></query><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully dropped graph @server@#xsdmodel</message></query><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>

Modified: trunk/jxdata/iTQL/data_types/binary/hexBinary/result1.txt
===================================================================
--- trunk/jxdata/iTQL/data_types/binary/hexBinary/result1.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/data_types/binary/hexBinary/result1.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully dropped model @server@#xsdmodel</message></query><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully dropped graph @server@#xsdmodel</message></query><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>

Modified: trunk/jxdata/iTQL/data_types/boolean/result1.txt
===================================================================
--- trunk/jxdata/iTQL/data_types/boolean/result1.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/data_types/boolean/result1.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully dropped model @server@#xsdmodel</message></query><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully dropped graph @server@#xsdmodel</message></query><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>

Modified: trunk/jxdata/iTQL/data_types/gDates/result1.txt
===================================================================
--- trunk/jxdata/iTQL/data_types/gDates/result1.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/data_types/gDates/result1.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully dropped model @server@#xsdmodel</message></query><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully dropped graph @server@#xsdmodel</message></query><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>

Modified: trunk/jxdata/iTQL/data_types/queryResult37.txt
===================================================================
--- trunk/jxdata/iTQL/data_types/queryResult37.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/data_types/queryResult37.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#unknowntype</message></query><query><message>Successfully inserted statements into @server@#unknowntype</message></query><query><variables><color/></variables><solution><color datatype="http://example.com/Color">pink</color></solution></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#unknowntype</message></query><query><message>Successfully inserted statements into @server@#unknowntype</message></query><query><variables><color/></variables><solution><color datatype="http://example.com/Color">pink</color></solution></query></answer>

Modified: trunk/jxdata/iTQL/data_types/result1.txt
===================================================================
--- trunk/jxdata/iTQL/data_types/result1.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/data_types/result1.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully dropped model @server@#xsdmodel</message></query><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully dropped graph @server@#xsdmodel</message></query><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query></answer>

Modified: trunk/jxdata/iTQL/filesystem/queryResult10.txt
===================================================================
--- trunk/jxdata/iTQL/filesystem/queryResult10.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/filesystem/queryResult10.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped model @server@#fsmodel</message></query><query><message>Successfully created model @server@#fsmodel</message></query><query><variables><object/></variables></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped graph @server@#fsmodel</message></query><query><message>Successfully created graph @server@#fsmodel</message></query><query><variables><object/></variables></query></answer>

Modified: trunk/jxdata/iTQL/filesystem/queryResult11.txt
===================================================================
--- trunk/jxdata/iTQL/filesystem/queryResult11.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/filesystem/queryResult11.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped model @server@#fsmodel</message></query><query><message>Successfully created model @server@#fsmodel</message></query><query><message>Successfully inserted statements into @server@?def#fsmodel</message></query><query><variables><object/></variables><solution><object>mp3</object></solution><solution><object>mbox</object></solution><solution><object>Trash</object></solution><solution><object>Root</object></solution><solution><object>Repository</object></solution><solution><object>Normal</object></solution><solution><object>InvalidAttachments</object></solution><solution><object>Invalid</object></solution><solution><object>Entries</object></solution><solution><object>EmptyHeader</object></solution><solution><object>Empty</object></solution><solution><object>CouldBe</object></solution><solution><object>Chrono_Trigger_600_AD_in_Piano.mp3</object></solution><solution><object>CVS</object></solution><solution><object>BadSubject</object></solution><solution><object>Attachments</object></solution></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped graph @server@#fsmodel</message></query><query><message>Successfully created graph @server@#fsmodel</message></query><query><message>Successfully inserted statements into @server@?def#fsmodel</message></query><query><variables><object/></variables><solution><object>mp3</object></solution><solution><object>mbox</object></solution><solution><object>Trash</object></solution><solution><object>Root</object></solution><solution><object>Repository</object></solution><solution><object>Normal</object></solution><solution><object>InvalidAttachments</object></solution><solution><object>Invalid</object></solution><solution><object>Entries</object></solution><solution><object>EmptyHeader</object></solution><solution><object>Empty</object></solution><solution><object>CouldBe</object></solution><solution><object>Chrono_Trigger_600_AD_in_Piano.mp3</object></solution><solution><object>CVS</object></solution><solution><object>BadSubject</object></solution><solution><object>Attachments</object></solution></query></answer>

Modified: trunk/jxdata/iTQL/filesystem/queryResult12.txt
===================================================================
--- trunk/jxdata/iTQL/filesystem/queryResult12.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/filesystem/queryResult12.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped model @server@#fsmodel</message></query><query><message>Successfully created model @server@#fsmodel</message></query><query><message>Successfully inserted statements into @server@?def#fsmodel</message></query><query><variables><object/></variables><solution><object>mbox</object></solution><solution><object>Trash</object></solution><solution><object>Root</object></solution><solution><object>Repository</object></solution><solution><object>Normal</object></solution><solution><object>InvalidAttachments</object></solution><solution><object>Entries</object></solution><solution><object>EmptyHeader</object></solution><solution><object>CouldBe</object></solution><solution><object>CVS</object></solution><solution><object>BadSubject</object></solution><solution><object>Attachments</object></solution></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped graph @server@#fsmodel</message></query><query><message>Successfully created graph @server@#fsmodel</message></query><query><message>Successfully inserted statements into @server@?def#fsmodel</message></query><query><variables><object/></variables><solution><object>mbox</object></solution><solution><object>Trash</object></solution><solution><object>Root</object></solution><solution><object>Repository</object></solution><solution><object>Normal</object></solution><solution><object>InvalidAttachments</object></solution><solution><object>Entries</object></solution><solution><object>EmptyHeader</object></solution><solution><object>CouldBe</object></solution><solution><object>CVS</object></solution><solution><object>BadSubject</object></solution><solution><object>Attachments</object></solution></query></answer>

Modified: trunk/jxdata/iTQL/filesystem/queryResult8.txt
===================================================================
--- trunk/jxdata/iTQL/filesystem/queryResult8.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/filesystem/queryResult8.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped model @server@#fsmodel</message></query><query><message>Successfully created model @server@#fsmodel</message></query><query><message>Successfully inserted statements into @server@?def#fsmodel</message></query><query><variables><object/></variables><solution><object>ical.rdf</object></solution></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped graph @server@#fsmodel</message></query><query><message>Successfully created graph @server@#fsmodel</message></query><query><message>Successfully inserted statements into @server@?def#fsmodel</message></query><query><variables><object/></variables><solution><object>ical.rdf</object></solution></query></answer>

Modified: trunk/jxdata/iTQL/filesystem/queryResult9.txt
===================================================================
--- trunk/jxdata/iTQL/filesystem/queryResult9.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/filesystem/queryResult9.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped model @server@#fsmodel</message></query><query><message>Successfully created model @server@#fsmodel</message></query><query><message>Successfully inserted statements into @server@?def#fsmodel</message></query><query><variables><object/></variables></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped graph @server@#fsmodel</message></query><query><message>Successfully created graph @server@#fsmodel</message></query><query><message>Successfully inserted statements into @server@?def#fsmodel</message></query><query><variables><object/></variables></query></answer>

Modified: trunk/jxdata/iTQL/filesystem/result1.txt
===================================================================
--- trunk/jxdata/iTQL/filesystem/result1.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/filesystem/result1.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#fsmodel</message></query><query><message>Successfully dropped model @server@#fsmodel</message></query><query><message>Successfully created model @server@#fsmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query><query><message>Successfully inserted statements into @server@?def#fsmodel</message></query><query><message>Successfully created model @server@#xsdmodel</message></query><query><message>Successfully dropped model @server@#xsdmodel</message></query><query><message>Successfully created model @server@#xsdmodel</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#fsmodel</message></query><query><message>Successfully dropped graph @server@#fsmodel</message></query><query><message>Successfully created graph @server@#fsmodel</message></query><query><message>Successfully aliased http://mulgara.org/mulgara# as exp</message></query><query><message>Successfully inserted statements into @server@?def#fsmodel</message></query><query><message>Successfully created graph @server@#xsdmodel</message></query><query><message>Successfully dropped graph @server@#xsdmodel</message></query><query><message>Successfully created graph @server@#xsdmodel</message></query></answer>

Modified: trunk/jxdata/iTQL/fulltext_queries/drop1.txt
===================================================================
--- trunk/jxdata/iTQL/fulltext_queries/drop1.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/fulltext_queries/drop1.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped model @server@#model1</message></query><query><message>Successfully dropped model @server@#fulltext</message></query><query><message>Successfully dropped model @server@#fulltext2</message></query><query><message>Successfully dropped model @server@#normal_zh</message></query><query><message>Successfully dropped model @server@#fulltext_zh</message></query><query><message>Successfully dropped model @server@#numbers_test</message></query><query><message>Successfully dropped model @server@#numbers_fulltext</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully dropped graph @server@#model1</message></query><query><message>Successfully dropped graph @server@#fulltext</message></query><query><message>Successfully dropped graph @server@#fulltext2</message></query><query><message>Successfully dropped graph @server@#normal_zh</message></query><query><message>Successfully dropped graph @server@#fulltext_zh</message></query><query><message>Successfully dropped graph @server@#numbers_test</message></query><query><message>Successfully dropped graph @server@#numbers_fulltext</message></query></answer>

Modified: trunk/jxdata/iTQL/fulltext_queries/queryResult8.txt
===================================================================
--- trunk/jxdata/iTQL/fulltext_queries/queryResult8.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/fulltext_queries/queryResult8.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#lucenetest</message></query><query><message>Successfully inserted statements into @server@#lucenetest</message></query><query><variables><page/></variables><solution><page resource="http://subject/"/></solution></query><query><message>Successfully dropped model @server@#lucenetest</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#lucenetest</message></query><query><message>Successfully inserted statements into @server@#lucenetest</message></query><query><variables><page/></variables><solution><page resource="http://subject/"/></solution></query><query><message>Successfully dropped graph @server@#lucenetest</message></query></answer>

Modified: trunk/jxdata/iTQL/fulltext_queries/result2.txt
===================================================================
--- trunk/jxdata/iTQL/fulltext_queries/result2.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/fulltext_queries/result2.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#fulltext</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#fulltext</message></query></answer>

Modified: trunk/jxdata/iTQL/fulltext_queries/result3.txt
===================================================================
--- trunk/jxdata/iTQL/fulltext_queries/result3.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/fulltext_queries/result3.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#fulltext2</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#fulltext2</message></query></answer>

Modified: trunk/jxdata/iTQL/fulltext_queries/result5.txt
===================================================================
--- trunk/jxdata/iTQL/fulltext_queries/result5.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/fulltext_queries/result5.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#numbers_fulltext</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#numbers_fulltext</message></query></answer>

Modified: trunk/jxdata/iTQL/fulltext_queries/result7.txt
===================================================================
--- trunk/jxdata/iTQL/fulltext_queries/result7.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/fulltext_queries/result7.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#fulltext_zh</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#fulltext_zh</message></query></answer>

Modified: trunk/jxdata/iTQL/insert/queryResult1.txt
===================================================================
--- trunk/jxdata/iTQL/insert/queryResult1.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/insert/queryResult1.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#inserttest</message></query><query><message>Successfully inserted statements into @server@#inserttest</message></query><query><variables><p/><o/></variables><solution><p resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/><o resource="http://www.w3.org/2002/12/cal/ical#Vevent"/></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#categories"/><o></o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#comment"/><o></o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#created"/><o>2004-05-10T12:12:24</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#description"/><o></o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#dtend"/><o>2004-05-10T08:00:00</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#dtstamp"/><o>2004-05-10T12:12:24</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#dtstart"/><o>2004-05-10T07:00:00</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#duration"/><o>01-01-01T00:00:00</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#lastmodified"/><o>2004-05-10T12:12:37</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#location"/><o>Here</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#sequence"/><o>1</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#summary"/><o>Summary</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#uid"/><o>1272862874444564481399228405</o></solution></query><query><message>Successfully dropped model @server@#inserttest</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#inserttest</message></query><query><message>Successfully inserted statements into @server@#inserttest</message></query><query><variables><p/><o/></variables><solution><p resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/><o resource="http://www.w3.org/2002/12/cal/ical#Vevent"/></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#categories"/><o></o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#comment"/><o></o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#created"/><o>2004-05-10T12:12:24</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#description"/><o></o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#dtend"/><o>2004-05-10T08:00:00</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#dtstamp"/><o>2004-05-10T12:12:24</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#dtstart"/><o>2004-05-10T07:00:00</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#duration"/><o>01-01-01T00:00:00</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#lastmodified"/><o>2004-05-10T12:12:37</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#location"/><o>Here</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#sequence"/><o>1</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#summary"/><o>Summary</o></solution><solution><p resource="http://www.w3.org/2002/12/cal/ical#uid"/><o>1272862874444564481399228405</o></solution></query><query><message>Successfully dropped graph @server@#inserttest</message></query></answer>

Modified: trunk/jxdata/iTQL/node_types/result1.txt
===================================================================
--- trunk/jxdata/iTQL/node_types/result1.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/node_types/result1.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#type</message></query><query><message>Successfully dropped model @server@#type</message></query><query><message>Successfully created model @server@#type</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#type</message></query><query><message>Successfully dropped graph @server@#type</message></query><query><message>Successfully created graph @server@#type</message></query></answer>

Modified: trunk/jxdata/iTQL/prefix/result1.txt
===================================================================
--- trunk/jxdata/iTQL/prefix/result1.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/prefix/result1.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#prefix</message></query><query><message>Successfully dropped model @server@#prefix</message></query><query><message>Successfully created model @server@#prefix</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#prefix</message></query><query><message>Successfully dropped graph @server@#prefix</message></query><query><message>Successfully created graph @server@#prefix</message></query></answer>

Modified: trunk/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/configResult.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/configResult.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/configResult.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#type</message></query><query><message>Successfully created model @server@#prefix</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#type</message></query><query><message>Successfully created graph @server@#prefix</message></query></answer>

Modified: trunk/jxdata/iTQL/rdfs/rdfs-domain-and-range/configResult.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-domain-and-range/configResult.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/rdfs/rdfs-domain-and-range/configResult.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#type</message></query><query><message>Successfully created model @server@#prefix</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#type</message></query><query><message>Successfully created graph @server@#prefix</message></query></answer>

Modified: trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/configResult.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/configResult.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/configResult.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#type</message></query><query><message>Successfully created model @server@#prefix</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#type</message></query><query><message>Successfully created graph @server@#prefix</message></query></answer>

Modified: trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/configResult.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/configResult.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/configResult.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#type</message></query><query><message>Successfully created model @server@#prefix</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#type</message></query><query><message>Successfully created graph @server@#prefix</message></query></answer>

Modified: trunk/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/configResult.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/configResult.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/configResult.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#type</message></query><query><message>Successfully created model @server@#prefix</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#type</message></query><query><message>Successfully created graph @server@#prefix</message></query></answer>

Modified: trunk/jxdata/iTQL/rdfs/statement-entailment/configResult.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs/statement-entailment/configResult.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/rdfs/statement-entailment/configResult.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created model @server@#type</message></query><query><message>Successfully created model @server@#prefix</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#type</message></query><query><message>Successfully created graph @server@#prefix</message></query></answer>

Modified: trunk/jxdata/iTQL/transactions/queryResult6.txt
===================================================================
--- trunk/jxdata/iTQL/transactions/queryResult6.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/transactions/queryResult6.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Auto commit is off</message></query><query><message>Successfully dropped model @server@#trans1</message></query><query><message>Successfully created model @server@#trans2</message></query><query><variables><p/><o/></variables></query><query><variables><p/><o/></variables><solution><p resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/><o resource="http://mulgara.org/mulgara#Model"/></solution></query><query><message>Successfully rolled back changes</message></query><query><message>Auto commit is on</message></query><query><variables><p/><o/></variables><solution><p resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/><o resource="http://mulgara.org/mulgara#Model"/></solution></query><query><variables><p/><o/></variables></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Auto commit is off</message></query><query><message>Successfully dropped graph @server@#trans1</message></query><query><message>Successfully created graph @server@#trans2</message></query><query><variables><p/><o/></variables></query><query><variables><p/><o/></variables><solution><p resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/><o resource="http://mulgara.org/mulgara#Model"/></solution></query><query><message>Successfully rolled back changes</message></query><query><message>Auto commit is on</message></query><query><variables><p/><o/></variables><solution><p resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/><o resource="http://mulgara.org/mulgara#Model"/></solution></query><query><variables><p/><o/></variables></query></answer>

Modified: trunk/jxdata/iTQL/transactions/queryResult7.txt
===================================================================
--- trunk/jxdata/iTQL/transactions/queryResult7.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/transactions/queryResult7.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Auto commit is off</message></query><query><message>Successfully dropped model @server@#trans1</message></query><query><message>Successfully created model @server@#trans2</message></query><query><variables><p/><o/></variables></query><query><variables><p/><o/></variables><solution><p resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/><o resource="http://mulgara.org/mulgara#Model"/></solution></query><query><message>Successfully committed transaction</message></query><query><message>Auto commit is on</message></query><query><variables><p/><o/></variables></query><query><variables><p/><o/></variables><solution><p resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/><o resource="http://mulgara.org/mulgara#Model"/></solution></query><query><message>Successfully dropped model @server@#trans2</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Auto commit is off</message></query><query><message>Successfully dropped graph @server@#trans1</message></query><query><message>Successfully created graph @server@#trans2</message></query><query><variables><p/><o/></variables></query><query><variables><p/><o/></variables><solution><p resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/><o resource="http://mulgara.org/mulgara#Model"/></solution></query><query><message>Successfully committed transaction</message></query><query><message>Auto commit is on</message></query><query><variables><p/><o/></variables></query><query><variables><p/><o/></variables><solution><p resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/><o resource="http://mulgara.org/mulgara#Model"/></solution></query><query><message>Successfully dropped graph @server@#trans2</message></query></answer>

Modified: trunk/jxdata/iTQL/transactions/queryResult8.txt
===================================================================
--- trunk/jxdata/iTQL/transactions/queryResult8.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/transactions/queryResult8.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Auto commit is off</message></query><query><message>Successfully created model @server@#trans3</message></query><query><message>Successfully inserted statements into @server@#trans3</message></query><query><variables><s/><o/></variables><solution><s resource="uri:subject1"/><o>1</o></solution></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Auto commit is off</message></query><query><message>Successfully created graph @server@#trans3</message></query><query><message>Successfully inserted statements into @server@#trans3</message></query><query><variables><s/><o/></variables><solution><s resource="uri:subject1"/><o>1</o></solution></query></answer>

Modified: trunk/jxdata/iTQL/transactions/queryResult9.txt
===================================================================
--- trunk/jxdata/iTQL/transactions/queryResult9.txt	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/jxdata/iTQL/transactions/queryResult9.txt	2008-02-26 05:34:43 UTC (rev 658)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Auto commit is off</message></query><query><message>Successfully created model @server@#trans3</message></query><query><message>Successfully inserted statements into @server@#trans3</message></query><query><variables><s/><o/></variables><solution><s resource="uri:subject1"/><o>1</o></solution></query><query><message>Successfully dropped model @server@#trans3</message></query><query><message>Auto commit is on</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Auto commit is off</message></query><query><message>Successfully created graph @server@#trans3</message></query><query><message>Successfully inserted statements into @server@#trans3</message></query><query><variables><s/><o/></variables><solution><s resource="uri:subject1"/><o>1</o></solution></query><query><message>Successfully dropped graph @server@#trans3</message></query><query><message>Auto commit is on</message></query></answer>

Modified: trunk/src/jar/ant-task/java/org/mulgara/ant/task/rdf/RDFLoad.java
===================================================================
--- trunk/src/jar/ant-task/java/org/mulgara/ant/task/rdf/RDFLoad.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/ant-task/java/org/mulgara/ant/task/rdf/RDFLoad.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -517,7 +517,7 @@
    */
   protected void createModel() throws BuildException {
     executeQuery("create <" + modelURI + "> ;", "create model",
-                 "Successfully created model ");
+                 "Successfully created graph ");
   }
 
   /**
@@ -527,7 +527,7 @@
    */
   protected void dropModel() throws BuildException {
     executeQuery("drop <" + modelURI + "> ;", "drop model",
-                 "Successfully dropped model ");
+                 "Successfully dropped graph ");
   }
 
   /**

Modified: trunk/src/jar/itql/java/org/mulgara/itql/Collaborator.java
===================================================================
--- trunk/src/jar/itql/java/org/mulgara/itql/Collaborator.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/itql/java/org/mulgara/itql/Collaborator.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -803,7 +803,7 @@
   public synchronized boolean createModel() throws SOAPException {
 
     log.warn("creating model " + SERVER + MODEL);
-    return executeCommand(CREATE_MODEL, "Successfully created model", false);
+    return executeCommand(CREATE_MODEL, "Successfully created graph", false);
   }
 
   /**
@@ -815,7 +815,7 @@
   public synchronized boolean dropModel() throws SOAPException {
 
     log.warn("dropping model " + SERVER + MODEL);
-    return executeCommand(DROP_MODEL, "Successfully dropped model", false);
+    return executeCommand(DROP_MODEL, "Successfully dropped graph", false);
   }
 
   /**

Added: trunk/src/jar/query/java/org/mulgara/connection/CommandExecutor.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/connection/CommandExecutor.java	                        (rev 0)
+++ trunk/src/jar/query/java/org/mulgara/connection/CommandExecutor.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -0,0 +1,53 @@
+/**
+ * The contents of this file are subject to the Open Software License
+ * Version 3.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.opensource.org/licenses/osl-3.0.txt
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ */
+package org.mulgara.connection;
+
+import org.mulgara.query.Answer;
+import org.mulgara.query.Query;
+import org.mulgara.query.QueryException;
+import org.mulgara.query.TuplesException;
+import org.mulgara.query.operation.Command;
+import org.mulgara.query.operation.Load;
+
+
+/**
+ * A central point to direct to commands on a connection.
+ *
+ * @created Feb 22, 2008
+ * @author Paul Gearon
+ * @copyright &copy; 2008 <a href="mailto:pgearon at users.sourceforge.net">Paul Gearon</a>
+ * @licence <a href="{@docRoot}/../../LICENCE.txt">Open Software License v3.0</a>
+ */
+public abstract class CommandExecutor implements Connection {
+
+  /**
+   * @see org.mulgara.connection.Connection#execute(org.mulgara.query.operation.Command)
+   */
+  public String execute(Command cmd) throws Exception {
+    return (String)cmd.execute(this);
+  }
+
+  /**
+   * @see org.mulgara.connection.Connection#execute(org.mulgara.query.operation.Load)
+   */
+  public Long execute(Load cmd) throws QueryException {
+    return (Long)cmd.execute(this);
+  }
+
+  /**
+   * @see org.mulgara.connection.Connection#execute(org.mulgara.query.Query)
+   */
+  public Answer execute(Query cmd) throws QueryException, TuplesException {
+    return (Answer)cmd.execute(this);
+  }
+
+}

Modified: trunk/src/jar/query/java/org/mulgara/connection/Connection.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/connection/Connection.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/connection/Connection.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -13,12 +13,57 @@
 
 import java.net.URI;
 
+import org.mulgara.query.Answer;
+import org.mulgara.query.Query;
 import org.mulgara.query.QueryException;
+import org.mulgara.query.TuplesException;
 import org.mulgara.server.Session;
+import org.mulgara.query.operation.*;
 
 /**
- * A connection for sending commands to a server.
+ * This class abstracts connections to a server, holding any information relevant to that
+ * connection.  For those operations that are to be performed on a server, this interface
+ * is used to send the operations.  Other operations can be kept local, but the mechanism
+ * appears the same to the user, thereby abstracting away the interaction that each command
+ * has with servers.
  *
+ * While Connections can be created with the normal constructor, it may be preferable to use
+ * an instance of {@link org.mulgara.connection.ConnectionFactory} in order to cache connections
+ * based on the server URI.
+ *
+ * {@link org.mulgara.query.operation.Command}s to be issued may be executed with a Connection
+ * as a parameter, or can be passed to a Connection.  The appropriate use depends on the usage.
+ * When creating commands in code, the preferred idiom is to pass to a Connection.  For instance:
+ * <pre><code>
+ *  ConnectionFactory factory = new ConnectionFactory();
+ *  Connection conn = factory.newConnection(URI.create("rmi://localhost/server1"));
+ *
+ *  URI graph = URI.create("rmi://localhost/server1#graph");
+ *  Command create = new CreateGraph(graph);
+ *  Command load = new Load(new File("data.rdf").toURI(), graph, false);
+ *  Command query = new TqlInterpreter().parseCommand(queryString);
+ *
+ *  conn.execute(create);
+ *  conn.execute(load);
+ *  Answer answer = conn.execute(query);
+ * </code></pre>
+ * 
+ * This mechanism has the advantage of returning the appropriate type for each type of command
+ * For instance, {@link Query} commands return an {@link Answer}, while most other commands
+ * return a status string.
+ *
+ * Alternatively, if the commands are being generated by a query language parser, then the command
+ * operation should be picked up via polymorphism by calling execute on the command instead.
+ * <pre><code>
+ *  ConnectionFactory factory = new ConnectionFactory();
+ *  Connection conn = factory.newConnection(URI.create("rmi://localhost/server1"));
+ *  
+ *  Interpreter interpreter = new TqlInterpreter();
+ *  Command cmd = interpreter.parseCommand(commandString);
+ *  
+ *  Object result = cmd.execute(conn);
+ * </code></pre>
+ * 
  * @created 2007-09-25
  * @author Paul Gearon
  * @copyright &copy; 2007 <a href="mailto:pgearon at users.sourceforge.net">Paul Gearon</a>
@@ -71,4 +116,29 @@
    * Closes the current connection.
    */
   public void close() throws QueryException;
+
+  // Central execution of Command operations
+
+  /**
+   * Generic command execution method.
+   * @param The command to execute.
+   * @return A status message
+   * @throws Exception A general exception catchall
+   */
+  public String execute(Command cmd) throws Exception;
+
+  /**
+   * Loads data from a file or URL
+   * @param cmd The command to load the data
+   * @return The number of loaded statements
+   */
+  public Long execute(Load cmd) throws QueryException;
+
+  /**
+   * Issues a query on the connection.
+   * @param cmd The command to issue the query.
+   * @return An Answer with the query results.
+   */
+  public Answer execute(Query cmd) throws QueryException, TuplesException;
+
 }
\ No newline at end of file

Modified: trunk/src/jar/query/java/org/mulgara/connection/DummyConnection.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/connection/DummyConnection.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/connection/DummyConnection.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -25,7 +25,7 @@
  * @copyright &copy; 2007 <a href="mailto:pgearon at users.sourceforge.net">Paul Gearon</a>
  * @licence <a href="{@docRoot}/../../LICENCE.txt">Open Software License v3.0</a>
  */
-public class DummyConnection implements Connection {
+public class DummyConnection extends CommandExecutor implements Connection {
 
   /** Logger. */
   private static final Logger logger = Logger.getLogger(DummyConnection.class.getName());

Modified: trunk/src/jar/query/java/org/mulgara/connection/SessionConnection.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/connection/SessionConnection.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/connection/SessionConnection.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -29,7 +29,7 @@
  * @copyright &copy; 2007 <a href="mailto:pgearon at users.sourceforge.net">Paul Gearon</a>
  * @licence <a href="{@docRoot}/../../LICENCE.txt">Open Software License v3.0</a>
  */
-public class SessionConnection implements Connection {
+public class SessionConnection extends CommandExecutor implements Connection {
 
   /** Logger. */
   private static final Logger logger = Logger.getLogger(SessionConnection.class.getName());

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/AddAlias.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/AddAlias.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/AddAlias.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -68,7 +68,7 @@
    * @param conn ignored.
    * @return The text of the help request.
    */
-  public Object execute(Connection conn) throws Exception {
+  public Object execute(Connection conn) {
     return setResultMessage(SUCCESS_MSG_PREFIX + aliasTarget + SUCCESS_MSG_AS + aliasPrefix);
   }
 

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -15,7 +15,9 @@
 
 import org.apache.log4j.Logger;
 import org.mulgara.connection.Connection;
+import org.mulgara.query.QueryException;
 
+
 /**
  * Represents a command to create a new graph.
  * @created Aug 10, 2007
@@ -33,7 +35,12 @@
   
   /** The URI for the type of the graph. */
   private final URI type;
-  
+
+  /**
+   * Create a new create graph command
+   * @param graphUri The identifier for the graph
+   * @param type The identifier for the graph type
+   */
   public CreateGraph(URI graphUri, URI type) {
     super(graphUri);
     this.graphUri = graphUri;
@@ -41,6 +48,16 @@
   }
   
   /**
+   * Create a new create graph command, using the default graph type.
+   * @param graphUri The identifier for the graph
+   */
+  public CreateGraph(URI graphUri) {
+    super(graphUri);
+    this.graphUri = graphUri;
+    this.type = null;
+  }
+  
+  /**
    * Get the URI of the graph to create.
    * @return the URI of the graph to create.
    */
@@ -61,10 +78,10 @@
    * @param The connection to a session to create the graph in.
    * @return Text describing the outcome.
    */
-  public Object execute(Connection conn) throws Exception {
-    if (logger.isDebugEnabled()) logger.debug("Creating new model " + graphUri);
+  public Object execute(Connection conn) throws QueryException {
+    if (logger.isDebugEnabled()) logger.debug("Creating new graph " + graphUri);
     conn.getSession().createModel(graphUri, type);
-    return setResultMessage("Successfully created model " + graphUri);
+    return setResultMessage("Successfully created graph " + graphUri);
   }
 
 }

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Deletion.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Deletion.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Deletion.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -17,6 +17,7 @@
 import org.jrdf.graph.Triple;
 import org.mulgara.connection.Connection;
 import org.mulgara.query.Query;
+import org.mulgara.query.QueryException;
 
 /**
  * An AST element for deleting from a graph.
@@ -50,7 +51,7 @@
    * @param conn the session to delete the data from the graph in.
    * @return Text describing the action.
    */
-  public Object execute(Connection conn) throws Exception {
+  public Object execute(Connection conn) throws QueryException {
     if (isSelectBased()) conn.getSession().delete(graph, getSelectQuery());
     else conn.getSession().delete(graph, getStatements());
     return setResultMessage("Successfully deleted statements from " + graph);

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/DropGraph.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/DropGraph.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/DropGraph.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -14,6 +14,7 @@
 import java.net.URI;
 
 import org.mulgara.connection.Connection;
+import org.mulgara.query.QueryException;
 
 /**
  * Represents a command to drop a graph.
@@ -45,9 +46,9 @@
    * @param conn the session to delete the graph in.
    * @return Text describing the action.
    */
-  public Object execute(Connection conn) throws Exception {
+  public Object execute(Connection conn) throws QueryException {
     conn.getSession().removeModel(graphUri);
-    return setResultMessage("Successfully dropped model " + graphUri);
+    return setResultMessage("Successfully dropped graph " + graphUri);
   }
 
 }

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Help.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Help.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Help.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -53,7 +53,7 @@
    * @param conn ignored.
    * @return The text of the help request.
    */
-  public Object execute(Connection conn) throws Exception {
+  public Object execute(Connection conn) {
     return setResultMessage(helpText);
   }
 

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Insertion.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Insertion.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Insertion.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -18,6 +18,7 @@
 import org.jrdf.graph.Triple;
 import org.mulgara.connection.Connection;
 import org.mulgara.query.Query;
+import org.mulgara.query.QueryException;
 
 /**
  * An AST element for inserting into a graph.
@@ -60,7 +61,7 @@
    * @param conn the session for the graph to insert the data into.
    * @return Text describing the action.
    */
-  public Object execute(Connection conn) throws Exception {
+  public Object execute(Connection conn) throws QueryException {
     if (isSelectBased()) conn.getSession().insert(graph, getSelectQuery());
     else conn.getSession().insert(graph, getStatements());
     return setResultMessage("Successfully inserted statements into " + graph);

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Load.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Load.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Load.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -53,7 +53,7 @@
    * @param conn The connection to load the data over.
    * @return The number of statements that were inserted.
    */
-  public Object execute(Connection conn) throws Exception {
+  public Object execute(Connection conn) throws QueryException {
     URI src = getSource();
     URI dest = getDestination();
     try {

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/NullOp.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/NullOp.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/NullOp.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -33,7 +33,7 @@
   /**
    * Do nothing.
    */
-  public Object execute(Connection conn) throws Exception {
+  public Object execute(Connection conn) {
     return null;
   }
 

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Quit.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Quit.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Quit.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -39,7 +39,7 @@
    * No specific action to be taken here.  The client needs to know that this message
    * requires exiting of the main process.
    */
-  public Object execute(Connection conn) throws Exception {
+  public Object execute(Connection conn) {
     return finalMessage;
   }
 

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -45,7 +45,7 @@
    * @param conn The connection to restore the data over.
    * @return A text string describing the operation.
    */
-  public Object execute(Connection conn) throws Exception {
+  public Object execute(Connection conn) throws QueryException {
     URI src = getSource();
     URI dest = getDestination();
     try {

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/SetTime.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/SetTime.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/SetTime.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -35,7 +35,7 @@
   /**
    * Does nothing at the client, except to indicate that time keeping records are required.
    */
-  public Object execute(Connection conn) throws Exception {
+  public Object execute(Connection conn) {
     return setResultMessage(SET_TIME + (isOn() ? ON : OFF));
   }
 }

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/SetUser.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/SetUser.java	2008-02-24 12:58:26 UTC (rev 657)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/SetUser.java	2008-02-26 05:34:43 UTC (rev 658)
@@ -90,7 +90,7 @@
   /**
    * Does nothing at the client, except to indicate that a user record has been created
    */
-  public Object execute(Connection conn) throws Exception {
+  public Object execute(Connection conn) {
     return setResultMessage(MESSAGE);
   }
 


