Merge pull request #136 from evolvedbinary/7.x.x/hotfix/xdm-error-compatibility

[7.x.x] Restore compatibility with EXPath Crypto Module

Author: adamretter

exist-core/src/main/java/org/exist/http/RESTServer.java

@@ -1523,7 +1523,7 @@ private void declareExternalAndXQJVariables(final XQueryContext context,
             }
 
             if (localname == null) {
-                throw new XPathException(ErrorCodes.W3CErrorCode.XPDY0002, String.format("External variable is missing local name in its qualified name. Prefix=%s URI=%s", prefix, uri));
+                throw new XPathException(ErrorCodes.W3CErrorCode.XPDY0002.getErrorCode(), String.format("External variable is missing local name in its qualified name. Prefix=%s URI=%s", prefix, uri));
             }
 
             if (uri == null && prefix != null) {
@@ -1538,7 +1538,7 @@ private void declareExternalAndXQJVariables(final XQueryContext context,
             }
 
             if (!context.isExternalVariableDeclared(q)) {
-                throw new XPathException(ErrorCodes.W3CErrorCode.XPDY0002, "External variable " + q + " is not declared in the XQuery");
+                throw new XPathException(ErrorCodes.W3CErrorCode.XPDY0002.getErrorCode(), "External variable " + q + " is not declared in the XQuery");
             }
 
             if (uri != null && prefix != null) {

exist-core/src/main/java/org/exist/xmldb/LocalXPathQueryService.java

@@ -434,11 +434,11 @@ protected void declareVariables(final XQueryContext context) throws XPathExcepti
             try {
                 varName = QName.parse(context, varNameStr);
             } catch (final QName.IllegalQNameException e) {
-                throw new XPathException(org.exist.xquery.ErrorCodes.W3CErrorCode.XPST0081, "Error declaring variable, invalid qname: " + varNameStr + ". " + e.getMessage(), e);
+                throw new XPathException(org.exist.xquery.ErrorCodes.W3CErrorCode.XPST0081.getErrorCode(), "Error declaring variable, invalid qname: " + varNameStr + ". " + e.getMessage(), e);
             }
 
             if (!context.isExternalVariableDeclared(varName)) {
-                throw new XPathException(org.exist.xquery.ErrorCodes.W3CErrorCode.XPDY0002, "External variable " + varName + " is not declared in the XQuery");
+                throw new XPathException(org.exist.xquery.ErrorCodes.W3CErrorCode.XPDY0002.getErrorCode(), "External variable " + varName + " is not declared in the XQuery");
             }
 
             context.declareVariable(varName, true, entry.getValue());

exist-core/src/main/java/org/exist/xmldb/RemoteXPathQueryService.java

@@ -204,7 +204,7 @@ private XPathException errorToXPathException(final Map result) {
             final QName qname = new QName(localPart, namespaceUri, prefix);
             errorCode = org.exist.xquery.ErrorCodes.fromQName(qname);
         } else {
-            errorCode = org.exist.xquery.ErrorCodes.EXistErrorCode.ERROR;
+            errorCode = org.exist.xquery.ErrorCodes.EXistErrorCode.ERROR.getErrorCode();
         }
 
         return new XPathException(line, column, errorCode, message);

exist-core/src/main/java/org/exist/xmlrpc/RpcConnection.java

@@ -279,11 +279,11 @@ protected QueryResult doQuery(final DBBroker broker, final CompiledXQuery compil
                     try {
                         varName = QName.parse(context, varNameStr);
                     } catch (final QName.IllegalQNameException e) {
-                        throw new XPathException(org.exist.xquery.ErrorCodes.W3CErrorCode.XPST0081, "Error declaring variable, invalid qname: " + varNameStr + ". " + e.getMessage(), e);
+                        throw new XPathException(org.exist.xquery.ErrorCodes.W3CErrorCode.XPST0081.getErrorCode(), "Error declaring variable, invalid qname: " + varNameStr + ". " + e.getMessage(), e);
                     }
 
                     if (!context.isExternalVariableDeclared(varName)) {
-                        throw new XPathException(org.exist.xquery.ErrorCodes.W3CErrorCode.XPDY0002, "External variable " + varName + " is not declared in the XQuery");
+                        throw new XPathException(org.exist.xquery.ErrorCodes.W3CErrorCode.XPDY0002.getErrorCode(), "External variable " + varName + " is not declared in the XQuery");
                     }
 
                     if (LOG.isDebugEnabled()) {