[Mulgara-svn] r190 - in trunk: jxdata/iTQL/data_types jxdata/iTQL/having_queries jxdata/iTQL/standard_queries jxdata/iTQL/transitive jxdata/iTQL/walk src/jar/query/java/org/mulgara/query src/jar/resolver/java/org/mulgara/resolver
andrae at mulgara.org
andrae at mulgara.org
Sun Feb 25 13:32:58 UTC 2007
Author: andrae
Date: 2007-02-25 07:32:57 -0600 (Sun, 25 Feb 2007)
New Revision: 190
Added:
trunk/src/jar/query/java/org/mulgara/query/MulgaraTransactionException.java
Removed:
trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionException.java
Modified:
trunk/jxdata/iTQL/data_types/queryResult34.txt
trunk/jxdata/iTQL/having_queries/queryResult10.txt
trunk/jxdata/iTQL/having_queries/queryResult15.txt
trunk/jxdata/iTQL/standard_queries/queryResult17.txt
trunk/jxdata/iTQL/standard_queries/queryResult18.txt
trunk/jxdata/iTQL/standard_queries/queryResult3.txt
trunk/jxdata/iTQL/transitive/result13.txt
trunk/jxdata/iTQL/transitive/result14.txt
trunk/jxdata/iTQL/walk/queryResult7.txt
trunk/src/jar/resolver/java/org/mulgara/resolver/AnswerOperation.java
trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java
trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java
trunk/src/jar/resolver/java/org/mulgara/resolver/TransactionOperation.java
trunk/src/jar/resolver/java/org/mulgara/resolver/TransactionalAnswer.java
Log:
Moved MulgaraTransactionException into org.mulgara.query. This makes it
accessable to the client allowing RMI transparency of exceptions - this is very
important to ensuring we get good bug reports.
Modified: trunk/jxdata/iTQL/data_types/queryResult34.txt
===================================================================
--- trunk/jxdata/iTQL/data_types/queryResult34.txt 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/jxdata/iTQL/data_types/queryResult34.txt 2007-02-25 13:32:57 UTC (rev 190)
@@ -1,6 +1,6 @@
ItqlInterpreter error - org.mulgara.query.QueryException: Could not commit insert
Caused by: (QueryException) Could not commit insert
-Caused by: (QueryException) org.mulgara.resolver.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
+Caused by: (QueryException) org.mulgara.query.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
Caused by: (QueryException) org.mulgara.resolver.spi.ResolverException: Unable to read input statements
Caused by: (QueryException) org.mulgara.query.TuplesException: Failed to localize node
Caused by: (QueryException) org.mulgara.resolver.spi.LocalizeException: Unable to localize "<test>test escape char</foo>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> - Couldn't convert Node to SPObject
Modified: trunk/jxdata/iTQL/having_queries/queryResult10.txt
===================================================================
--- trunk/jxdata/iTQL/having_queries/queryResult10.txt 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/jxdata/iTQL/having_queries/queryResult10.txt 2007-02-25 13:32:57 UTC (rev 190)
@@ -1,5 +1,5 @@
ItqlInterpreter error - org.mulgara.query.QueryException: Query failed
Caused by: (QueryException) Query failed
-Caused by: (QueryException) org.mulgara.resolver.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
+Caused by: (QueryException) org.mulgara.query.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
Caused by: (QueryException) Failed to resolve query
Caused by: (QueryException) org.mulgara.query.TuplesException: No such variable $v in tuples [$s, $k0] (class org.mulgara.resolver.AppendAggregateTuples)
Modified: trunk/jxdata/iTQL/having_queries/queryResult15.txt
===================================================================
--- trunk/jxdata/iTQL/having_queries/queryResult15.txt 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/jxdata/iTQL/having_queries/queryResult15.txt 2007-02-25 13:32:57 UTC (rev 190)
@@ -1,5 +1,5 @@
ItqlInterpreter error - org.mulgara.query.QueryException: Query failed
Caused by: (QueryException) Query failed
-Caused by: (QueryException) org.mulgara.resolver.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
+Caused by: (QueryException) org.mulgara.query.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
Caused by: (QueryException) Failed to resolve query
Caused by: (QueryException) org.mulgara.query.TuplesException: No such variable $k0 in tuples [$p, $v, $s] (class org.mulgara.resolver.AppendAggregateTuples)
Modified: trunk/jxdata/iTQL/standard_queries/queryResult17.txt
===================================================================
--- trunk/jxdata/iTQL/standard_queries/queryResult17.txt 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/jxdata/iTQL/standard_queries/queryResult17.txt 2007-02-25 13:32:57 UTC (rev 190)
@@ -1,4 +1,4 @@
ItqlInterpreter error - org.mulgara.query.QueryException: Could not commit insert
Caused by: (QueryException) Could not commit insert
-Caused by: (QueryException) org.mulgara.resolver.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
+Caused by: (QueryException) org.mulgara.query.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
Caused by: (QueryException) rmi://localhost/server1#nomodelexistswiththisname is not a Model
Modified: trunk/jxdata/iTQL/standard_queries/queryResult18.txt
===================================================================
--- trunk/jxdata/iTQL/standard_queries/queryResult18.txt 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/jxdata/iTQL/standard_queries/queryResult18.txt 2007-02-25 13:32:57 UTC (rev 190)
@@ -1,5 +1,5 @@
ItqlInterpreter error - org.mulgara.query.QueryException: Query failed
Caused by: (QueryException) Query failed
-Caused by: (QueryException) org.mulgara.resolver.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
+Caused by: (QueryException) org.mulgara.query.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
Caused by: (QueryException) Error resolving [$s $p $o $_from] from mailto:foo at bar.com
Caused by: (QueryException) Unable to extract hostname from: mailto:foo at bar.com
Modified: trunk/jxdata/iTQL/standard_queries/queryResult3.txt
===================================================================
--- trunk/jxdata/iTQL/standard_queries/queryResult3.txt 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/jxdata/iTQL/standard_queries/queryResult3.txt 2007-02-25 13:32:57 UTC (rev 190)
@@ -1,5 +1,5 @@
ItqlInterpreter error - org.mulgara.query.QueryException: Query failed
Caused by: (QueryException) Query failed
-Caused by: (QueryException) org.mulgara.resolver.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
+Caused by: (QueryException) org.mulgara.query.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
Caused by: (QueryException) Error resolving [$pmid http://mulgara.org/mulgara/Document#subject "Birds" $_from] from @server@#badmodel
Caused by: (QueryException) @server@#badmodel is not a Model
Modified: trunk/jxdata/iTQL/transitive/result13.txt
===================================================================
--- trunk/jxdata/iTQL/transitive/result13.txt 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/jxdata/iTQL/transitive/result13.txt 2007-02-25 13:32:57 UTC (rev 190)
@@ -1,4 +1,4 @@
ItqlInterpreter error - org.mulgara.query.QueryException: Query failed
Caused by: (QueryException) Query failed
-Caused by: (QueryException) org.mulgara.resolver.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
+Caused by: (QueryException) org.mulgara.query.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
Caused by: (QueryException) Predicate in transitive function, $p, currently must be bound to a value.
Modified: trunk/jxdata/iTQL/transitive/result14.txt
===================================================================
--- trunk/jxdata/iTQL/transitive/result14.txt 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/jxdata/iTQL/transitive/result14.txt 2007-02-25 13:32:57 UTC (rev 190)
@@ -1,4 +1,4 @@
ItqlInterpreter error - org.mulgara.query.QueryException: Query failed
Caused by: (QueryException) Query failed
-Caused by: (QueryException) org.mulgara.resolver.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
+Caused by: (QueryException) org.mulgara.query.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
Caused by: (QueryException) Predicate in transitive function, $p, currently must be bound to a value.
Modified: trunk/jxdata/iTQL/walk/queryResult7.txt
===================================================================
--- trunk/jxdata/iTQL/walk/queryResult7.txt 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/jxdata/iTQL/walk/queryResult7.txt 2007-02-25 13:32:57 UTC (rev 190)
@@ -1,8 +1,8 @@
ItqlInterpreter error - org.mulgara.query.QueryException: Error getting information for answer
Caused by: (QueryException) Error getting information for answer
Caused by: (QueryException) org.mulgara.query.TuplesException: Transaction error
-Caused by: (QueryException) org.mulgara.resolver.MulgaraTransactionException: Transaction already in rollback
-Caused by: (QueryException) org.mulgara.resolver.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
+Caused by: (QueryException) org.mulgara.query.MulgaraTransactionException: Transaction already in rollback
+Caused by: (QueryException) org.mulgara.query.MulgaraTransactionException: Failed transaction finalised. (ROLLBACK)
Caused by: (QueryException) org.mulgara.query.TuplesException: Couldn't evaluate aggregate
Caused by: (QueryException) Failed to resolve subquery
Caused by: (QueryException) The subject: $head and the object: $n are invalid, one must be a variable and the other a fixed value around a predicate.
Added: trunk/src/jar/query/java/org/mulgara/query/MulgaraTransactionException.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/MulgaraTransactionException.java 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/src/jar/query/java/org/mulgara/query/MulgaraTransactionException.java 2007-02-25 13:32:57 UTC (rev 190)
@@ -0,0 +1,47 @@
+/*
+ * 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.rosenlaw.com/OSL3.0.htm
+ *
+ * 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.
+ *
+ * This file is an original work developed by Netymon Pty Ltd
+ * (http://www.netymon.com, mailto:mail at netymon.com). Portions created
+ * by Netymon Pty Ltd are Copyright (c) 2006 Netymon Pty Ltd.
+ * All Rights Reserved.
+ */
+package org.mulgara.query;
+
+/**
+ * Exception to indicate a failure within the transaction handling.
+ *
+ * @created 2006-10-06
+ *
+ * @author <a href="mailto:andrae at netymon.com">Andrae Muys</a>
+ *
+ * @version $Revision: $
+ *
+ * @modified $Date: $
+ *
+ * @maintenanceAuthor $Author: $
+ *
+ * @company <A href="mailto:mail at netymon.com">Netymon Pty Ltd</A>
+ *
+ * @copyright ©2006 <a href="http://www.netymon.com/">Netymon Pty Ltd</a>
+ *
+ * @licence Open Software License v3.0</a>
+ */
+public class MulgaraTransactionException extends Exception
+{
+ public MulgaraTransactionException(String message) {
+ super(message);
+ }
+
+ public MulgaraTransactionException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/AnswerOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/AnswerOperation.java 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/AnswerOperation.java 2007-02-25 13:32:57 UTC (rev 190)
@@ -18,6 +18,7 @@
package org.mulgara.resolver;
import org.mulgara.query.TuplesException;
+import org.mulgara.query.MulgaraTransactionException;
public abstract class AnswerOperation {
// Should use enum here.
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java 2007-02-25 13:32:57 UTC (rev 190)
@@ -30,6 +30,7 @@
import org.mulgara.resolver.spi.EnlistableResource;
import org.mulgara.resolver.spi.ResolverSessionFactory;
+import org.mulgara.query.MulgaraTransactionException;
import org.mulgara.query.TuplesException;
import org.mulgara.query.QueryException;
Deleted: trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionException.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionException.java 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionException.java 2007-02-25 13:32:57 UTC (rev 190)
@@ -1,47 +0,0 @@
-/*
- * 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.rosenlaw.com/OSL3.0.htm
- *
- * 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.
- *
- * This file is an original work developed by Netymon Pty Ltd
- * (http://www.netymon.com, mailto:mail at netymon.com). Portions created
- * by Netymon Pty Ltd are Copyright (c) 2006 Netymon Pty Ltd.
- * All Rights Reserved.
- */
-package org.mulgara.resolver;
-
-/**
- * Exception to indicate a failure within the transaction handling.
- *
- * @created 2006-10-06
- *
- * @author <a href="mailto:andrae at netymon.com">Andrae Muys</a>
- *
- * @version $Revision: $
- *
- * @modified $Date: $
- *
- * @maintenanceAuthor $Author: $
- *
- * @company <A href="mailto:mail at netymon.com">Netymon Pty Ltd</A>
- *
- * @copyright ©2006 <a href="http://www.netymon.com/">Netymon Pty Ltd</a>
- *
- * @licence Open Software License v3.0</a>
- */
-public class MulgaraTransactionException extends Exception
-{
- public MulgaraTransactionException(String message) {
- super(message);
- }
-
- public MulgaraTransactionException(String message, Throwable cause) {
- super(message, cause);
- }
-}
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java 2007-02-25 13:32:57 UTC (rev 190)
@@ -32,6 +32,7 @@
import org.apache.log4j.Logger;
// Local packages
+import org.mulgara.query.MulgaraTransactionException;
import org.mulgara.server.Session;
import org.mulgara.transaction.TransactionManagerFactory;
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/TransactionOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/TransactionOperation.java 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/TransactionOperation.java 2007-02-25 13:32:57 UTC (rev 190)
@@ -17,7 +17,7 @@
package org.mulgara.resolver;
-import org.mulgara.query.TuplesException;
+import org.mulgara.query.MulgaraTransactionException;
interface TransactionOperation {
public void execute() throws MulgaraTransactionException;
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/TransactionalAnswer.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/TransactionalAnswer.java 2007-02-24 23:44:05 UTC (rev 189)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/TransactionalAnswer.java 2007-02-25 13:32:57 UTC (rev 190)
@@ -22,6 +22,7 @@
// Local packages
import org.mulgara.query.Answer;
+import org.mulgara.query.MulgaraTransactionException;
import org.mulgara.query.TuplesException;
import org.mulgara.query.Variable;
More information about the Mulgara-svn
mailing list