[Mulgara-svn] r624 - in branches/mgr-73: jxdata/iTQL/standard_queries src/jar/resolver/java/org/mulgara/resolver

[andrae at mulgara.org]

Author: andrae
Date: 2008-01-14 01:32:29 -0800 (Mon, 14 Jan 2008)
New Revision: 624

Modified:
   branches/mgr-73/jxdata/iTQL/standard_queries/queryResult17.txt
   branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/JotmTransactionStandaloneTest.java
Log:
refs #73

With this release the JTA branch now enters beta.

With this commit the merger with trunk now tests 100% - please hammer this
version.  I will give it a week or two and then update trunk and close this
branch.



Modified: branches/mgr-73/jxdata/iTQL/standard_queries/queryResult17.txt
===================================================================
--- branches/mgr-73/jxdata/iTQL/standard_queries/queryResult17.txt	2008-01-14 08:08:12 UTC (rev 623)
+++ branches/mgr-73/jxdata/iTQL/standard_queries/queryResult17.txt	2008-01-14 09:32:29 UTC (rev 624)
@@ -1,3 +1,3 @@
 ItqlInterpreter error - Could not commit modify
 Caused by: (QueryException) org.mulgara.query.MulgaraTransactionException: Transaction rollback triggered
-Caused by: (QueryException) @@server@@#nomodelexistswiththisname is not a Model
+Caused by: (QueryException) rmi://localhost/server1#nomodelexistswiththisname is not a Model

Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/JotmTransactionStandaloneTest.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/JotmTransactionStandaloneTest.java	2008-01-14 08:08:12 UTC (rev 623)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/JotmTransactionStandaloneTest.java	2008-01-14 09:32:29 UTC (rev 624)
@@ -62,11 +62,11 @@
     try {
       databaseURI    = new URI("rmi://localhost/server1");
       systemModelURI = new URI("rmi://localhost/server1#");
-      modelURI       = new URI("rmi://localhost/server1#model");
-      model2URI      = new URI("rmi://localhost/server1#model2");
-      model3URI      = new URI("rmi://localhost/server1#model3");
-      model4URI      = new URI("rmi://localhost/server1#model4");
-      model5URI      = new URI("rmi://localhost/server1#model5");
+      modelURI       = new URI("rmi://localhost/server1#jotmmodel");
+      model2URI      = new URI("rmi://localhost/server1#jotmmodel2");
+      model3URI      = new URI("rmi://localhost/server1#jotmmodel3");
+      model4URI      = new URI("rmi://localhost/server1#jotmmodel4");
+      model5URI      = new URI("rmi://localhost/server1#jotmmodel5");
     } catch (URISyntaxException e) {
       throw new Error("Bad hardcoded URI", e);
     }