[Mxquery-commit] SF.net SVN: mxquery:[4369] trunk/MXQuery

[<pm_...@us...>]

Revision: 4369
          http://mxquery.svn.sourceforge.net/mxquery/?rev=4369&view=rev
Author:   pm_fischer
Date:     2011-05-25 18:40:36 +0000 (Wed, 25 May 2011)

Log Message:
-----------
- fix nested module import problem on XQIB
- reStore building on Java 1.4

Modified Paths:
--------------
    trunk/MXQuery/build.xml
    trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/Function.java

Modified: trunk/MXQuery/build.xml
===================================================================
--- trunk/MXQuery/build.xml	2011-05-24 13:54:45 UTC (rev 4368)
+++ trunk/MXQuery/build.xml	2011-05-25 18:40:36 UTC (rev 4369)
@@ -217,7 +217,7 @@
 	<copy file="${altsrc.dir}/ch/ethz/mxquery/query/impl/CompilerImpl.java" todir="${customtmp.dir}/ch/ethz/mxquery/query/impl" overwrite="yes" />
     <copy file="${altsrc.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java" todir="${customtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/" overwrite="yes" />
    	<copy file="${altsrc.dir}/ch/ethz/mxquery/functions/math/TransMath.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/math" overwrite="yes" />
-  	<copy file="${altsrc.dir}/ch/ethz/mxquery/functions/Matches.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/" overwrite="yes" />
+  	<copy file="${altsrc.dir}/ch/ethz/mxquery/functions/fn/Matches.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
 
 
 		<depend srcdir="${customtmp.dir}"

Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/Function.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/Function.java	2011-05-24 13:54:45 UTC (rev 4368)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/Function.java	2011-05-25 18:40:36 UTC (rev 4369)
@@ -27,6 +27,7 @@
 import ch.ethz.mxquery.functions.FunctionSignature;
 import ch.ethz.mxquery.iterators.UserdefFuncCall;
 import ch.ethz.mxquery.model.XDMIterator;
+import ch.ethz.mxquery.util.Hashtable;
 
 /**
  * Holds information on the function metadata and methods to retrieve the
@@ -80,9 +81,10 @@
     public Function getAsExternalFunction(String prefix) {
 	QName fName = new QName(signature.getName().getNamespaceURI(), prefix,
 		signature.getName().getLocalPart());
+	Hashtable annotations = signature.getAllAnnotations();
+	annotations.put(FunctionSignature.PRIVATE_ANNOTATION,new XDMIterator[]{});
 	FunctionSignature newSig = new FunctionSignature(fName, signature.paramTypes
-		, FunctionSignature.EXTERNAL_FUNCTION,
-		signature.getAllAnnotations());
+		, FunctionSignature.EXTERNAL_FUNCTION,annotations);
 	Function func = new Function(className, newSig, iter, operation, returnType);
 	return func;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.