Menu
▾
▴
[Exist-commits] SF.net SVN: exist:[9068] branches/shabanovd/xslt/extensions
|
From: <sha...@us...> - 2009-05-23 16:28:39
|
Revision: 9068
http://exist.svn.sourceforge.net/exist/?rev=9068&view=rev
Author: shabanovd
Date: 2009-05-23 16:28:37 +0000 (Sat, 23 May 2009)
Log Message:
-----------
[ignore] merge trunk
Modified Paths:
--------------
branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/metadata/MetadataFunction.java
branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/scheduler/GetScheduledJobs.java
branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/scheduler/ScheduleFunctions.java
branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/simpleql/ParseSimpleQL.java
branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/sql/ExecuteFunction.java
branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/sql/GetConnectionFunction.java
branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/sql/GetJNDIConnectionFunction.java
branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/svn/SVNLog.java
branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/xmldiff/Compare.java
branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/xslfo/RenderFunction.java
branches/shabanovd/xslt/extensions/versioning/src/org/exist/versioning/xquery/DiffFunction.java
branches/shabanovd/xslt/extensions/versioning/src/org/exist/versioning/xquery/PatchFunction.java
Modified: branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/metadata/MetadataFunction.java
===================================================================
--- branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/metadata/MetadataFunction.java 2009-05-23 16:27:19 UTC (rev 9067)
+++ branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/metadata/MetadataFunction.java 2009-05-23 16:28:37 UTC (rev 9068)
@@ -63,7 +63,7 @@
//must be a context to act on
if(contextSequence == null)
{
- throw new XPathException(getASTNode(), "FONC0001: undefined context item");
+ throw new XPathException(this, "FONC0001: undefined context item");
}
//iterate through the source documents
Modified: branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/scheduler/GetScheduledJobs.java
===================================================================
--- branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/scheduler/GetScheduledJobs.java 2009-05-23 16:27:19 UTC (rev 9067)
+++ branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/scheduler/GetScheduledJobs.java 2009-05-23 16:28:37 UTC (rev 9068)
@@ -173,7 +173,7 @@
}
catch(SAXException se)
{
- throw(new XPathException(getASTNode(), se));
+ throw(new XPathException(this, se.getMessage(), se));
}
}
}
\ No newline at end of file
Modified: branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/scheduler/ScheduleFunctions.java
===================================================================
--- branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/scheduler/ScheduleFunctions.java 2009-05-23 16:27:19 UTC (rev 9067)
+++ branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/scheduler/ScheduleFunctions.java 2009-05-23 16:28:37 UTC (rev 9068)
@@ -317,7 +317,7 @@
String name = elem.getAttribute("name");
String value = elem.getAttribute("value");
if(name == null || value == null)
- throw new XPathException(getASTNode(), "Name or value attribute missing for stylesheet parameter");
+ throw new XPathException(this, "Name or value attribute missing for stylesheet parameter");
properties.setProperty(name, value);
}
child = child.getNextSibling();
Modified: branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/simpleql/ParseSimpleQL.java
===================================================================
--- branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/simpleql/ParseSimpleQL.java 2009-05-23 16:27:19 UTC (rev 9067)
+++ branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/simpleql/ParseSimpleQL.java 2009-05-23 16:28:37 UTC (rev 9068)
@@ -62,9 +62,9 @@
try {
return new StringValue(parser.expr());
} catch (RecognitionException e) {
- throw new XPathException(getASTNode(), "An error occurred while parsing the query expression: " + e.getMessage(), e);
+ throw new XPathException(this, "An error occurred while parsing the query expression: " + e.getMessage(), e);
} catch (TokenStreamException e) {
- throw new XPathException(getASTNode(), "An error occurred while parsing the query expression: " + e.getMessage(), e);
+ throw new XPathException(this, "An error occurred while parsing the query expression: " + e.getMessage(), e);
}
}
}
Modified: branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/sql/ExecuteFunction.java
===================================================================
--- branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/sql/ExecuteFunction.java 2009-05-23 16:27:19 UTC (rev 9067)
+++ branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/sql/ExecuteFunction.java 2009-05-23 16:28:37 UTC (rev 9068)
@@ -273,18 +273,14 @@
builder.characters(escapeXmlText(sql));
builder.endElement();
- XQueryAST astNode = getASTNode();
- if(astNode != null)
- {
- int line = astNode.getLine();
- int column = astNode.getColumn();
+ int line = getLine();
+ int column = getColumn();
builder.startElement(new QName("xquery", SQLModule.NAMESPACE_URI, SQLModule.PREFIX), null);
builder.addAttribute(new QName("line", null, null), String.valueOf(line));
builder.addAttribute(new QName("column", null, null), String.valueOf(column));
builder.endElement();
- }
-
+
builder.endElement();
builder.endDocument();
Modified: branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/sql/GetConnectionFunction.java
===================================================================
--- branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/sql/GetConnectionFunction.java 2009-05-23 16:27:19 UTC (rev 9067)
+++ branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/sql/GetConnectionFunction.java 2009-05-23 16:28:37 UTC (rev 9068)
@@ -160,27 +160,27 @@
LOG.error(
"sql:get-connection() Illegal Access to database driver class: "
+ dbDriver, iae);
- throw new XPathException(getASTNode(),
+ throw new XPathException(this,
"sql:get-connection() Illegal Access to database driver class: "
+ dbDriver, iae);
} catch (ClassNotFoundException cnfe) {
LOG.error(
"sql:get-connection() Cannot find database driver class: "
+ dbDriver, cnfe);
- throw new XPathException(getASTNode(),
+ throw new XPathException(this,
"sql:get-connection() Cannot find database driver class: "
+ dbDriver, cnfe);
} catch (InstantiationException ie) {
LOG.error(
"sql:get-connection() Cannot instantiate database driver class: "
+ dbDriver, ie);
- throw new XPathException(getASTNode(),
+ throw new XPathException(this,
"sql:get-connection() Cannot instantiate database driver class: "
+ dbDriver, ie);
} catch (SQLException sqle) {
LOG.error("sql:get-connection() Cannot connect to database: "
+ dbURL, sqle);
- throw new XPathException(getASTNode(),
+ throw new XPathException(this,
"sql:get-connection() Cannot connect to database: " + dbURL,
sqle);
}
Modified: branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/sql/GetJNDIConnectionFunction.java
===================================================================
--- branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/sql/GetJNDIConnectionFunction.java 2009-05-23 16:27:19 UTC (rev 9067)
+++ branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/sql/GetJNDIConnectionFunction.java 2009-05-23 16:28:37 UTC (rev 9068)
@@ -129,7 +129,7 @@
// store the connection and return the uid handle of the connection
return new IntegerValue(SQLModule.storeConnection(context, con));
} catch (Exception e) {
- throw new XPathException(getASTNode(), e.getMessage());
+ throw new XPathException(this, e.getMessage());
}
}
}
Modified: branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/svn/SVNLog.java
===================================================================
--- branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/svn/SVNLog.java 2009-05-23 16:27:19 UTC (rev 9067)
+++ branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/svn/SVNLog.java 2009-05-23 16:28:37 UTC (rev 9068)
@@ -104,7 +104,7 @@
builder.endElement();
return builder.getDocument().getNode(nodeNr);
} catch (SVNException e) {
- throw new XPathException(getASTNode(), e.getMessage(), e);
+ throw new XPathException(this, e.getMessage(), e);
}
}
Modified: branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/xmldiff/Compare.java
===================================================================
--- branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/xmldiff/Compare.java 2009-05-23 16:27:19 UTC (rev 9067)
+++ branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/xmldiff/Compare.java 2009-05-23 16:28:37 UTC (rev 9068)
@@ -114,7 +114,7 @@
}
result = new BooleanValue(identical);
} catch (Exception e) {
- throw new XPathException(getASTNode(), "An exception occurred while serializing node " +
+ throw new XPathException(this, "An exception occurred while serializing node " +
"for comparison: " + e.getMessage(), e);
}
Modified: branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/xslfo/RenderFunction.java
===================================================================
--- branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/xslfo/RenderFunction.java 2009-05-23 16:27:19 UTC (rev 9067)
+++ branches/shabanovd/xslt/extensions/modules/src/org/exist/xquery/modules/xslfo/RenderFunction.java 2009-05-23 16:28:37 UTC (rev 9068)
@@ -181,9 +181,9 @@
// return the result
return new Base64Binary(baos.toByteArray());
} catch (TransformerException te) {
- throw new XPathException(getASTNode(), te);
+ throw new XPathException(this, te.getMessageAndLocation(), te);
} catch (SAXException se) {
- throw new XPathException(getASTNode(), se);
+ throw new XPathException(this, se.getMessage(), se);
}
}
Modified: branches/shabanovd/xslt/extensions/versioning/src/org/exist/versioning/xquery/DiffFunction.java
===================================================================
--- branches/shabanovd/xslt/extensions/versioning/src/org/exist/versioning/xquery/DiffFunction.java 2009-05-23 16:27:19 UTC (rev 9067)
+++ branches/shabanovd/xslt/extensions/versioning/src/org/exist/versioning/xquery/DiffFunction.java 2009-05-23 16:28:37 UTC (rev 9068)
@@ -70,7 +70,7 @@
NodeValue nv2 = (NodeValue) args[1].itemAt(0);
if (nv1.getImplementationType() != NodeValue.PERSISTENT_NODE ||
nv2.getImplementationType() != NodeValue.PERSISTENT_NODE)
- throw new XPathException(getASTNode(), "diff function only works on persistent documents stored in the db");
+ throw new XPathException(this, "diff function only works on persistent documents stored in the db");
DocumentImpl doc1 = ((NodeProxy)nv1).getDocument();
DocumentImpl doc2 = ((NodeProxy)nv2).getDocument();
@@ -94,9 +94,9 @@
builder.endElement();
return builder.getDocument().getNode(nodeNr);
} catch (SAXException e) {
- throw new XPathException(getASTNode(), "Caugt error while generating diff: " + e.getMessage(), e);
+ throw new XPathException(this, "Caugt error while generating diff: " + e.getMessage(), e);
} catch (DiffException e) {
- throw new XPathException(getASTNode(), "Caugt error while generating diff: " + e.getMessage(), e);
+ throw new XPathException(this, "Caugt error while generating diff: " + e.getMessage(), e);
} finally {
context.popDocumentContext();
}
Modified: branches/shabanovd/xslt/extensions/versioning/src/org/exist/versioning/xquery/PatchFunction.java
===================================================================
--- branches/shabanovd/xslt/extensions/versioning/src/org/exist/versioning/xquery/PatchFunction.java 2009-05-23 16:27:19 UTC (rev 9067)
+++ branches/shabanovd/xslt/extensions/versioning/src/org/exist/versioning/xquery/PatchFunction.java 2009-05-23 16:28:37 UTC (rev 9068)
@@ -107,11 +107,11 @@
NodeValue result = (NodeValue) builder.getDocument().getDocumentElement();
return result == null ? Sequence.EMPTY_SEQUENCE : result;
} catch (IOException e) {
- throw new XPathException(getASTNode(), e.getMessage(), e);
+ throw new XPathException(this, e.getMessage(), e);
} catch (XMLStreamException e) {
- throw new XPathException(getASTNode(), e.getMessage(), e);
+ throw new XPathException(this, e.getMessage(), e);
} catch (DiffException e) {
- throw new XPathException(getASTNode(), e.getMessage(), e);
+ throw new XPathException(this, e.getMessage(), e);
} finally {
context.popDocumentContext();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|