svn commit: r1300816 [3/6] - in /incubator/vxquery/branches/vxquery_algebricks: vxquery-core/src/main/java/org/apache/vxquery/api/ vxquery-core/src/main/java/org/apache/vxquery/compiler/ vxquery-core/src/main/java/org/apache/vxquery/context/ vxquery-co...

[vi...@apache.org]

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnRoundHalfToEvenIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnRoundHalfToEvenIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnRoundHalfToEvenIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnRoundHalfToEvenIterator.java Thu Mar 15 06:31:00 2012
@@ -17,12 +17,12 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.IntegerValue;
-import org.apache.vxquery.datamodel.atomic.NumericValue;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractUnaryNumericFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.IntegerValue;
+import org.apache.vxquery.v0datamodel.atomic.NumericValue;
 
 public class FnRoundHalfToEvenIterator extends AbstractUnaryNumericFunctionIterator {
     public FnRoundHalfToEvenIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnRoundHalfToEvenIteratorWithPrecision.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnRoundHalfToEvenIteratorWithPrecision.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnRoundHalfToEvenIteratorWithPrecision.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnRoundHalfToEvenIteratorWithPrecision.java Thu Mar 15 06:31:00 2012
@@ -17,8 +17,6 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.IntegerValue;
-import org.apache.vxquery.datamodel.atomic.NumericValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
@@ -26,6 +24,8 @@ import org.apache.vxquery.runtime.Regist
 import org.apache.vxquery.runtime.RuntimeUtils;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.IntegerValue;
+import org.apache.vxquery.v0datamodel.atomic.NumericValue;
 
 public class FnRoundHalfToEvenIteratorWithPrecision extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnRoundHalfToEvenIteratorWithPrecision(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnRoundIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnRoundIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnRoundIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnRoundIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.NumericValue;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractUnaryNumericFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.NumericValue;
 
 public class FnRoundIterator extends AbstractUnaryNumericFunctionIterator {
     public FnRoundIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSecondsFromDateTimeIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSecondsFromDateTimeIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSecondsFromDateTimeIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSecondsFromDateTimeIterator.java Thu Mar 15 06:31:00 2012
@@ -19,13 +19,13 @@ package org.apache.vxquery.runtime.funct
 import java.math.BigDecimal;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.DateTimeValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.DateTimeValue;
 
 public class FnSecondsFromDateTimeIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnSecondsFromDateTimeIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSecondsFromDurationIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSecondsFromDurationIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSecondsFromDurationIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSecondsFromDurationIterator.java Thu Mar 15 06:31:00 2012
@@ -19,13 +19,13 @@ package org.apache.vxquery.runtime.funct
 import java.math.BigDecimal;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.DurationValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.DurationValue;
 
 public class FnSecondsFromDurationIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnSecondsFromDurationIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSecondsFromTimeIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSecondsFromTimeIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSecondsFromTimeIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSecondsFromTimeIterator.java Thu Mar 15 06:31:00 2012
@@ -19,13 +19,13 @@ package org.apache.vxquery.runtime.funct
 import java.math.BigDecimal;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.TimeValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.TimeValue;
 
 public class FnSecondsFromTimeIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnSecondsFromTimeIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStartsWithIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStartsWithIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStartsWithIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStartsWithIterator.java Thu Mar 15 06:31:00 2012
@@ -18,14 +18,14 @@ package org.apache.vxquery.runtime.funct
 
 import org.apache.vxquery.collations.Collation;
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.BooleanValue;
-import org.apache.vxquery.datamodel.atomic.StringValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.BooleanValue;
+import org.apache.vxquery.v0datamodel.atomic.StringValue;
 
 public class FnStartsWithIterator extends AbstractStringMatchingIterator {
     public FnStartsWithIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStaticBaseUriIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStaticBaseUriIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStaticBaseUriIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStaticBaseUriIterator.java Thu Mar 15 06:31:00 2012
@@ -17,7 +17,6 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.AtomicValueFactory;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
@@ -25,6 +24,7 @@ import org.apache.vxquery.runtime.Regist
 import org.apache.vxquery.runtime.RuntimeControlBlock;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.AtomicValueFactory;
 
 public class FnStaticBaseUriIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnStaticBaseUriIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringIterator.java Thu Mar 15 06:31:00 2012
@@ -17,14 +17,14 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.StringValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.StringValue;
 
 public class FnStringIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnStringIterator(RegisterAllocator allocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringJoinIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringJoinIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringJoinIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringJoinIterator.java Thu Mar 15 06:31:00 2012
@@ -17,14 +17,14 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.StringValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.StringValue;
 
 public class FnStringJoinIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnStringJoinIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringLengthIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringLengthIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringLengthIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringLengthIterator.java Thu Mar 15 06:31:00 2012
@@ -17,9 +17,6 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.IntValue;
-import org.apache.vxquery.datamodel.atomic.StringValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
@@ -27,6 +24,9 @@ import org.apache.vxquery.runtime.Regist
 import org.apache.vxquery.runtime.RuntimeUtils;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.IntValue;
+import org.apache.vxquery.v0datamodel.atomic.StringValue;
 
 public class FnStringLengthIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnStringLengthIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringToCodepointsIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringToCodepointsIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringToCodepointsIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnStringToCodepointsIterator.java Thu Mar 15 06:31:00 2012
@@ -20,9 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.EagerlyMaterializedXDMSequenceImpl;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.AtomicValueFactory;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
@@ -30,6 +27,9 @@ import org.apache.vxquery.runtime.Regist
 import org.apache.vxquery.runtime.RuntimeUtils;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.EagerlyMaterializedXDMSequenceImpl;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.AtomicValueFactory;
 
 public class FnStringToCodepointsIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnStringToCodepointsIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSubstringAfterIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSubstringAfterIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSubstringAfterIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSubstringAfterIterator.java Thu Mar 15 06:31:00 2012
@@ -18,13 +18,13 @@ package org.apache.vxquery.runtime.funct
 
 import org.apache.vxquery.collations.Collation;
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.StringValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.StringValue;
 
 public class FnSubstringAfterIterator extends AbstractStringMatchingIterator {
     public FnSubstringAfterIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSubstringBeforeIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSubstringBeforeIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSubstringBeforeIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSubstringBeforeIterator.java Thu Mar 15 06:31:00 2012
@@ -18,13 +18,13 @@ package org.apache.vxquery.runtime.funct
 
 import org.apache.vxquery.collations.Collation;
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.StringValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.StringValue;
 
 public class FnSubstringBeforeIterator extends AbstractStringMatchingIterator {
     public FnSubstringBeforeIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSubstringIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSubstringIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSubstringIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnSubstringIterator.java Thu Mar 15 06:31:00 2012
@@ -17,8 +17,6 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.StringValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
@@ -26,6 +24,8 @@ import org.apache.vxquery.runtime.Regist
 import org.apache.vxquery.runtime.RuntimeUtils;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.StringValue;
 
 public class FnSubstringIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnSubstringIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTimezoneFromDateIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTimezoneFromDateIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTimezoneFromDateIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTimezoneFromDateIterator.java Thu Mar 15 06:31:00 2012
@@ -17,13 +17,13 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.DateValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.DateValue;
 
 public class FnTimezoneFromDateIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnTimezoneFromDateIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTimezoneFromDateTimeIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTimezoneFromDateTimeIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTimezoneFromDateTimeIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTimezoneFromDateTimeIterator.java Thu Mar 15 06:31:00 2012
@@ -17,13 +17,13 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.DateTimeValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.DateTimeValue;
 
 public class FnTimezoneFromDateTimeIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnTimezoneFromDateTimeIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTimezoneFromTimeIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTimezoneFromTimeIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTimezoneFromTimeIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTimezoneFromTimeIterator.java Thu Mar 15 06:31:00 2012
@@ -17,13 +17,13 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.TimeValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.TimeValue;
 
 public class FnTimezoneFromTimeIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnTimezoneFromTimeIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTraceIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTraceIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTraceIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTraceIterator.java Thu Mar 15 06:31:00 2012
@@ -17,7 +17,6 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.StringValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
@@ -25,6 +24,7 @@ import org.apache.vxquery.runtime.LocalR
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.StringValue;
 
 public class FnTraceIterator extends AbstractFunctionIterator {
     private final LocalRegisterAccessor<String> label;

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTranslateIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTranslateIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTranslateIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTranslateIterator.java Thu Mar 15 06:31:00 2012
@@ -17,8 +17,6 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.StringValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
@@ -26,6 +24,8 @@ import org.apache.vxquery.runtime.Regist
 import org.apache.vxquery.runtime.RuntimeUtils;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.StringValue;
 
 public class FnTranslateIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnTranslateIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTrueIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTrueIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTrueIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnTrueIterator.java Thu Mar 15 06:31:00 2012
@@ -17,13 +17,13 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.BooleanValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.BooleanValue;
 
 public class FnTrueIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnTrueIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments, StaticContext ctx) {

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnUpperCaseIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnUpperCaseIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnUpperCaseIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnUpperCaseIterator.java Thu Mar 15 06:31:00 2012
@@ -17,8 +17,6 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.StringValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
@@ -26,6 +24,8 @@ import org.apache.vxquery.runtime.Regist
 import org.apache.vxquery.runtime.RuntimeUtils;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.StringValue;
 
 public class FnUpperCaseIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnUpperCaseIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnYearFromDateIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnYearFromDateIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnYearFromDateIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnYearFromDateIterator.java Thu Mar 15 06:31:00 2012
@@ -17,13 +17,13 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.DateValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.DateValue;
 
 public class FnYearFromDateIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnYearFromDateIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnYearFromDateTimeIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnYearFromDateTimeIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnYearFromDateTimeIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnYearFromDateTimeIterator.java Thu Mar 15 06:31:00 2012
@@ -17,13 +17,13 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.DateTimeValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.DateTimeValue;
 
 public class FnYearFromDateTimeIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnYearFromDateTimeIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnYearsFromDurationIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnYearsFromDurationIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnYearsFromDurationIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnYearsFromDurationIterator.java Thu Mar 15 06:31:00 2012
@@ -17,13 +17,13 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.DurationValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.DurationValue;
 
 public class FnYearsFromDurationIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnYearsFromDurationIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnZeroOrOneIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnZeroOrOneIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnZeroOrOneIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/FnZeroOrOneIterator.java Thu Mar 15 06:31:00 2012
@@ -17,7 +17,6 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
 import org.apache.vxquery.exceptions.ErrorCode;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
@@ -25,6 +24,7 @@ import org.apache.vxquery.runtime.CallSt
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
 
 public class FnZeroOrOneIterator extends AbstractEagerlyEvaluatedFunctionIterator {
     public FnZeroOrOneIterator(RegisterAllocator allocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralEqComparisonIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralEqComparisonIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralEqComparisonIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralEqComparisonIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.compare.ValueComparator;
-import org.apache.vxquery.datamodel.atomic.compare.ValueEqComparator;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueComparator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueEqComparator;
 
 public class GeneralEqComparisonIterator extends AbstractGeneralComparisonIterator {
     public GeneralEqComparisonIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralGeComparisonIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralGeComparisonIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralGeComparisonIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralGeComparisonIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.compare.ValueComparator;
-import org.apache.vxquery.datamodel.atomic.compare.ValueGeComparator;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueComparator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueGeComparator;
 
 public class GeneralGeComparisonIterator extends AbstractGeneralComparisonIterator {
     public GeneralGeComparisonIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralGtComparisonIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralGtComparisonIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralGtComparisonIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralGtComparisonIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.compare.ValueComparator;
-import org.apache.vxquery.datamodel.atomic.compare.ValueGtComparator;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueComparator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueGtComparator;
 
 public class GeneralGtComparisonIterator extends AbstractGeneralComparisonIterator {
     public GeneralGtComparisonIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralLeComparisonIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralLeComparisonIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralLeComparisonIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralLeComparisonIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.compare.ValueComparator;
-import org.apache.vxquery.datamodel.atomic.compare.ValueLeComparator;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueComparator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueLeComparator;
 
 public class GeneralLeComparisonIterator extends AbstractGeneralComparisonIterator {
     public GeneralLeComparisonIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralLtComparisonIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralLtComparisonIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralLtComparisonIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralLtComparisonIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.compare.ValueComparator;
-import org.apache.vxquery.datamodel.atomic.compare.ValueLtComparator;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueComparator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueLtComparator;
 
 public class GeneralLtComparisonIterator extends AbstractGeneralComparisonIterator {
     public GeneralLtComparisonIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralNeComparisonIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralNeComparisonIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralNeComparisonIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/GeneralNeComparisonIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.compare.ValueComparator;
-import org.apache.vxquery.datamodel.atomic.compare.ValueNeComparator;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueComparator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueNeComparator;
 
 public class GeneralNeComparisonIterator extends AbstractGeneralComparisonIterator {
     public GeneralNeComparisonIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/IntegerDivideArithmeticOperationIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/IntegerDivideArithmeticOperationIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/IntegerDivideArithmeticOperationIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/IntegerDivideArithmeticOperationIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.arithmetics.ArithmeticOperation;
-import org.apache.vxquery.datamodel.atomic.arithmetics.IntegerDivideArithmeticOperation;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.arithmetics.ArithmeticOperation;
+import org.apache.vxquery.v0datamodel.atomic.arithmetics.IntegerDivideArithmeticOperation;
 
 public class IntegerDivideArithmeticOperationIterator extends AbstractArithmeticOperationIterator {
     public IntegerDivideArithmeticOperationIterator(RegisterAllocator allocator, Function fn,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ModArithmeticOperationIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ModArithmeticOperationIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ModArithmeticOperationIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ModArithmeticOperationIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.arithmetics.ArithmeticOperation;
-import org.apache.vxquery.datamodel.atomic.arithmetics.ModArithmeticOperation;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.arithmetics.ArithmeticOperation;
+import org.apache.vxquery.v0datamodel.atomic.arithmetics.ModArithmeticOperation;
 
 public class ModArithmeticOperationIterator extends AbstractArithmeticOperationIterator {
     public ModArithmeticOperationIterator(RegisterAllocator allocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/MultiplyArithmeticOperationIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/MultiplyArithmeticOperationIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/MultiplyArithmeticOperationIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/MultiplyArithmeticOperationIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.arithmetics.ArithmeticOperation;
-import org.apache.vxquery.datamodel.atomic.arithmetics.MultiplyArithmeticOperation;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.arithmetics.ArithmeticOperation;
+import org.apache.vxquery.v0datamodel.atomic.arithmetics.MultiplyArithmeticOperation;
 
 public class MultiplyArithmeticOperationIterator extends AbstractArithmeticOperationIterator {
     public MultiplyArithmeticOperationIterator(RegisterAllocator allocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/NumericUnaryMinusIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/NumericUnaryMinusIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/NumericUnaryMinusIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/NumericUnaryMinusIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.NumericValue;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractUnaryNumericFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.NumericValue;
 
 public class NumericUnaryMinusIterator extends AbstractUnaryNumericFunctionIterator {
     public NumericUnaryMinusIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments, StaticContext ctx) {

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExceptIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExceptIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExceptIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExceptIterator.java Thu Mar 15 06:31:00 2012
@@ -17,7 +17,6 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMNode;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
@@ -25,6 +24,7 @@ import org.apache.vxquery.runtime.LocalR
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractLazilyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMNode;
 
 public class OpExceptIterator extends AbstractLazilyEvaluatedFunctionIterator {
     private final LocalRegisterAccessor<XDMNode> nextException;

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesAscIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesAscIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesAscIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesAscIterator.java Thu Mar 15 06:31:00 2012
@@ -19,12 +19,12 @@ package org.apache.vxquery.runtime.funct
 import java.util.Comparator;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.XDMNode;
-import org.apache.vxquery.datamodel.atomic.compare.ComparisonUtils;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.XDMNode;
+import org.apache.vxquery.v0datamodel.atomic.compare.ComparisonUtils;
 
 public class OpExtSortAndDistinctNodesAscIterator extends AbstractItemSortingAndDistinctIterator {
     public OpExtSortAndDistinctNodesAscIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesAscOrAtomicsIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesAscOrAtomicsIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesAscOrAtomicsIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesAscOrAtomicsIterator.java Thu Mar 15 06:31:00 2012
@@ -19,11 +19,11 @@ package org.apache.vxquery.runtime.funct
 import java.util.Comparator;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.compare.ComparisonUtils;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.compare.ComparisonUtils;
 
 public class OpExtSortAndDistinctNodesAscOrAtomicsIterator extends AbstractSortAndDistinctNodesOrAtomicsIterator {
     public OpExtSortAndDistinctNodesAscOrAtomicsIterator(RegisterAllocator rAllocator, Function fn,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesDescIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesDescIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesDescIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesDescIterator.java Thu Mar 15 06:31:00 2012
@@ -19,12 +19,12 @@ package org.apache.vxquery.runtime.funct
 import java.util.Comparator;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.XDMNode;
-import org.apache.vxquery.datamodel.atomic.compare.ComparisonUtils;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.XDMNode;
+import org.apache.vxquery.v0datamodel.atomic.compare.ComparisonUtils;
 
 public class OpExtSortAndDistinctNodesDescIterator extends AbstractItemSortingAndDistinctIterator {
     public OpExtSortAndDistinctNodesDescIterator(RegisterAllocator rAllocator, Function fn,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesDescOrAtomicsIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesDescOrAtomicsIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesDescOrAtomicsIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortAndDistinctNodesDescOrAtomicsIterator.java Thu Mar 15 06:31:00 2012
@@ -19,11 +19,11 @@ package org.apache.vxquery.runtime.funct
 import java.util.Comparator;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.compare.ComparisonUtils;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.compare.ComparisonUtils;
 
 public class OpExtSortAndDistinctNodesDescOrAtomicsIterator extends AbstractSortAndDistinctNodesOrAtomicsIterator {
     public OpExtSortAndDistinctNodesDescOrAtomicsIterator(RegisterAllocator rAllocator, Function fn,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortNodesAscIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortNodesAscIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortNodesAscIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortNodesAscIterator.java Thu Mar 15 06:31:00 2012
@@ -19,11 +19,11 @@ package org.apache.vxquery.runtime.funct
 import java.util.Comparator;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.compare.ComparisonUtils;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.compare.ComparisonUtils;
 
 public class OpExtSortNodesAscIterator extends AbstractItemSortingIterator {
     public OpExtSortNodesAscIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortNodesDescIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortNodesDescIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortNodesDescIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpExtSortNodesDescIterator.java Thu Mar 15 06:31:00 2012
@@ -19,11 +19,11 @@ package org.apache.vxquery.runtime.funct
 import java.util.Comparator;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMItem;
-import org.apache.vxquery.datamodel.atomic.compare.ComparisonUtils;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMItem;
+import org.apache.vxquery.v0datamodel.atomic.compare.ComparisonUtils;
 
 public class OpExtSortNodesDescIterator extends AbstractItemSortingIterator {
     public OpExtSortNodesDescIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpIntersectIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpIntersectIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpIntersectIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpIntersectIterator.java Thu Mar 15 06:31:00 2012
@@ -15,13 +15,13 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMNode;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractLazilyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMNode;
 
 public class OpIntersectIterator extends AbstractLazilyEvaluatedFunctionIterator {
     public OpIntersectIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments, StaticContext ctx) {

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpIsSameNodeIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpIsSameNodeIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpIsSameNodeIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpIsSameNodeIterator.java Thu Mar 15 06:31:00 2012
@@ -15,10 +15,10 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMNode;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMNode;
 
 public class OpIsSameNodeIterator extends AbstractNodeComparisonIterator {
     public OpIsSameNodeIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpNodeAfterIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpNodeAfterIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpNodeAfterIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpNodeAfterIterator.java Thu Mar 15 06:31:00 2012
@@ -15,10 +15,10 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMNode;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMNode;
 
 public class OpNodeAfterIterator extends AbstractNodeComparisonIterator {
     public OpNodeAfterIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments, StaticContext ctx) {

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpNodeBeforeIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpNodeBeforeIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpNodeBeforeIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpNodeBeforeIterator.java Thu Mar 15 06:31:00 2012
@@ -15,10 +15,10 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.XDMNode;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.XDMNode;
 
 public class OpNodeBeforeIterator extends AbstractNodeComparisonIterator {
     public OpNodeBeforeIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpToIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpToIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpToIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/OpToIterator.java Thu Mar 15 06:31:00 2012
@@ -19,7 +19,6 @@ package org.apache.vxquery.runtime.funct
 import java.math.BigInteger;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.NumericValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.CallStackFrame;
@@ -28,6 +27,7 @@ import org.apache.vxquery.runtime.Regist
 import org.apache.vxquery.runtime.RegisterSet;
 import org.apache.vxquery.runtime.base.AbstractLazilyEvaluatedFunctionIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.NumericValue;
 
 public class OpToIterator extends AbstractLazilyEvaluatedFunctionIterator {
     private final LocalRegisterAccessor<Boolean> first;

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/SubtractArithmeticOperationIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/SubtractArithmeticOperationIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/SubtractArithmeticOperationIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/SubtractArithmeticOperationIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.arithmetics.ArithmeticOperation;
-import org.apache.vxquery.datamodel.atomic.arithmetics.SubtractArithmeticOperation;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.arithmetics.ArithmeticOperation;
+import org.apache.vxquery.v0datamodel.atomic.arithmetics.SubtractArithmeticOperation;
 
 public class SubtractArithmeticOperationIterator extends AbstractArithmeticOperationIterator {
     public SubtractArithmeticOperationIterator(RegisterAllocator allocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueEqComparisonIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueEqComparisonIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueEqComparisonIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueEqComparisonIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.compare.ValueComparator;
-import org.apache.vxquery.datamodel.atomic.compare.ValueEqComparator;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueComparator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueEqComparator;
 
 public class ValueEqComparisonIterator extends AbstractValueComparisonIterator {
     public ValueEqComparisonIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueGeComparisonIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueGeComparisonIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueGeComparisonIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueGeComparisonIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.compare.ValueComparator;
-import org.apache.vxquery.datamodel.atomic.compare.ValueGeComparator;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueComparator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueGeComparator;
 
 public class ValueGeComparisonIterator extends AbstractValueComparisonIterator {
     public ValueGeComparisonIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueGtComparisonIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueGtComparisonIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueGtComparisonIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueGtComparisonIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.compare.ValueComparator;
-import org.apache.vxquery.datamodel.atomic.compare.ValueGtComparator;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueComparator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueGtComparator;
 
 public class ValueGtComparisonIterator extends AbstractValueComparisonIterator {
     public ValueGtComparisonIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueLeComparisonIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueLeComparisonIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueLeComparisonIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueLeComparisonIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.compare.ValueComparator;
-import org.apache.vxquery.datamodel.atomic.compare.ValueLeComparator;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueComparator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueLeComparator;
 
 public class ValueLeComparisonIterator extends AbstractValueComparisonIterator {
     public ValueLeComparisonIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueLtComparisonIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueLtComparisonIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueLtComparisonIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueLtComparisonIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.compare.ValueComparator;
-import org.apache.vxquery.datamodel.atomic.compare.ValueLtComparator;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueComparator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueLtComparator;
 
 public class ValueLtComparisonIterator extends AbstractValueComparisonIterator {
     public ValueLtComparisonIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueNeComparisonIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueNeComparisonIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueNeComparisonIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/ValueNeComparisonIterator.java Thu Mar 15 06:31:00 2012
@@ -17,11 +17,11 @@
 package org.apache.vxquery.runtime.functions;
 
 import org.apache.vxquery.context.StaticContext;
-import org.apache.vxquery.datamodel.atomic.compare.ValueComparator;
-import org.apache.vxquery.datamodel.atomic.compare.ValueNeComparator;
 import org.apache.vxquery.functions.Function;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueComparator;
+import org.apache.vxquery.v0datamodel.atomic.compare.ValueNeComparator;
 
 public class ValueNeComparisonIterator extends AbstractValueComparisonIterator {
     public ValueNeComparisonIterator(RegisterAllocator rAllocator, Function fn, RuntimeIterator[] arguments,

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/nodes/AttributeConstructorIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/nodes/AttributeConstructorIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/nodes/AttributeConstructorIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/nodes/AttributeConstructorIterator.java Thu Mar 15 06:31:00 2012
@@ -16,14 +16,14 @@
 */
 package org.apache.vxquery.runtime.nodes;
 
-import org.apache.vxquery.datamodel.NodeFactory;
-import org.apache.vxquery.datamodel.atomic.QNameValue;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.RuntimeUtils;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.NodeFactory;
+import org.apache.vxquery.v0datamodel.atomic.QNameValue;
 
 public class AttributeConstructorIterator extends AbstractEagerlyEvaluatedIterator {
     private final RuntimeIterator ni;

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/nodes/CommentConstructorIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/nodes/CommentConstructorIterator.java?rev=1300816&r1=1300815&r2=1300816&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/nodes/CommentConstructorIterator.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/nodes/CommentConstructorIterator.java Thu Mar 15 06:31:00 2012
@@ -16,13 +16,13 @@
 */
 package org.apache.vxquery.runtime.nodes;
 
-import org.apache.vxquery.datamodel.NodeFactory;
-import org.apache.vxquery.datamodel.XDMItem;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.CallStackFrame;
 import org.apache.vxquery.runtime.RegisterAllocator;
 import org.apache.vxquery.runtime.base.AbstractEagerlyEvaluatedIterator;
 import org.apache.vxquery.runtime.base.RuntimeIterator;
+import org.apache.vxquery.v0datamodel.NodeFactory;
+import org.apache.vxquery.v0datamodel.XDMItem;
 
 public class CommentConstructorIterator extends AbstractEagerlyEvaluatedIterator {
     private final RuntimeIterator ci;