xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minc...@apache.org
Subject svn commit: r468651 - /xalan/java/trunk/src/org/apache/xalan/xsltc/dom/
Date Sat, 28 Oct 2006 07:04:27 GMT
Author: minchau
Date: Sat Oct 28 00:04:25 2006
New Revision: 468651

URL: http://svn.apache.org/viewvc?view=rev&rev=468651
Log:
Apache license update per XALANJ-2328.

Modified:
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AbsoluteIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AnyNodeCounter.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/BitArray.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CachedNodeListIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CollatorFactoryBase.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMAdapter.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMBuilder.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMWSFilter.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DocumentCache.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DupFilterIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/EmptyFilter.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ExtendedSAX.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/Filter.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/FilterIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/FilteredStepIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/KeyIndex.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/LoadDocument.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MatchingIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultiDOM.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeCounter.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeIteratorBase.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NthIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ObjectFactory.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SAXImpl.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SecuritySupport.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SecuritySupport12.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SingleNodeCounter.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SingletonIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SortSettings.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SortingIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/StepIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/UnionIterator.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AbsoluteIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AbsoluteIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AbsoluteIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AbsoluteIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AnyNodeCounter.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AnyNodeCounter.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AnyNodeCounter.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/AnyNodeCounter.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/BitArray.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/BitArray.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/BitArray.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/BitArray.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CachedNodeListIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CachedNodeListIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CachedNodeListIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CachedNodeListIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CollatorFactoryBase.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CollatorFactoryBase.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CollatorFactoryBase.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CollatorFactoryBase.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMAdapter.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMAdapter.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMAdapter.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMAdapter.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMBuilder.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMBuilder.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMBuilder.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMBuilder.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMWSFilter.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMWSFilter.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMWSFilter.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DOMWSFilter.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2002-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DocumentCache.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DocumentCache.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DocumentCache.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DocumentCache.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DupFilterIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DupFilterIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DupFilterIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/DupFilterIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/EmptyFilter.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/EmptyFilter.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/EmptyFilter.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/EmptyFilter.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ExtendedSAX.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ExtendedSAX.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ExtendedSAX.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ExtendedSAX.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/Filter.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/Filter.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/Filter.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/Filter.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/FilterIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/FilterIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/FilterIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/FilterIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/FilteredStepIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/FilteredStepIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/FilteredStepIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/FilteredStepIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/KeyIndex.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/KeyIndex.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/KeyIndex.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/KeyIndex.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/LoadDocument.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/LoadDocument.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/LoadDocument.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/LoadDocument.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MatchingIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MatchingIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MatchingIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MatchingIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultiDOM.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultiDOM.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultiDOM.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultiDOM.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java Sat Oct 28 00:04:25 2006
@@ -1,292 +1,294 @@
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * $Id: UnionIterator.java 337874 2004-02-16 23:06:53Z minchau $
- */
-
-package org.apache.xalan.xsltc.dom;
-
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
-
-/**
- * <p><code>MultiValuedNodeHeapIterator</code> takes a set of multi-valued
- * heap nodes and produces a merged NodeSet in document order with duplicates
- * removed.</p>
- * <p>Each multi-valued heap node (which might be a
- * {@link org.apache.xml.dtm.DTMAxisIterator}, but that's  not necessary)
- * generates DTM node handles in document order.  The class
- * maintains the multi-valued heap nodes in a heap, not surprisingly, sorted by
- * the next DTM node handle available form the heap node.</p>
- * <p>After a DTM node is pulled from the heap node that's at the top of the
- * heap, the heap node is advanced to the next DTM node handle it makes
- * available, and the heap nature of the heap is restored to ensure the next
- * DTM node handle pulled is next in document order overall.
- *
- * @author Jacek Ambroziak
- * @author Santiago Pericas-Geertsen
- */
-public abstract class MultiValuedNodeHeapIterator extends DTMAxisIteratorBase {
-    /** wrapper for NodeIterators to support iterator
-	comparison on the value of their next() method
-    */
-
-    /**
-     * An abstract representation of a set of nodes that will be retrieved in
-     * document order.
-     */
-    public abstract class HeapNode implements Cloneable {
-	protected int _node, _markedNode;
-	protected boolean _isStartSet = false;
-		
-        /**
-         * Advance to the next node represented by this {@link HeapNode}
-         *
-         * @return the next DTM node.
-         */
-	public abstract int step();
-
-
-        /**
-         * Creates a deep copy of this {@link HeapNode}.  The clone is not
-         * reset from the current position of the original.
-         *
-         * @return the cloned heap node
-         */
-	public HeapNode cloneHeapNode() {
-            HeapNode clone;
-
-            try {
-                clone = (HeapNode) super.clone();
-            } catch (CloneNotSupportedException e) {
-                BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
-                                          e.toString());
-                return null;
-            }
-
-	    clone._node = _node;
-	    clone._markedNode = _node;
-
-	    return clone;
-	}
-
-        /**
-         * Remembers the current node for the next call to {@link #gotoMark()}.
-         */
-	public void setMark() {
-	    _markedNode = _node;
-	}
-
-        /**
-         * Restores the current node remembered by {@link #setMark()}.
-         */
-	public void gotoMark() {
-	    _node = _markedNode;
-	}
-
-        /**
-         * Performs a comparison of the two heap nodes
-         *
-         * @param heapNode the heap node against which to compare
-         * @return <code>true</code> if and only if the current node for this
-         *         heap node is before the current node of the argument heap
-         *         node in document order.
-         */
-        public abstract boolean isLessThan(HeapNode heapNode);
-
-        /**
-         * Sets context with respect to which this heap node is evaluated.
-         *
-         * @param node The new context node
-         * @return a {@link HeapNode} which may or may not be the same as
-         *         this <code>HeapNode</code>.
-         */
-        public abstract HeapNode setStartNode(int node);
-
-        /**
-         * Reset the heap node back to its beginning.
-         *
-         * @return a {@link HeapNode} which may or may not be the same as
-         *         this <code>HeapNode</code>.
-         */
-        public abstract HeapNode reset();
-    } // end of HeapNode
-
-    private static final int InitSize = 8;
-  
-    private int        _heapSize = 0;
-    private int        _size = InitSize;
-    private HeapNode[] _heap = new HeapNode[InitSize];
-    private int        _free = 0;
-  
-    // Last node returned by this MultiValuedNodeHeapIterator to the caller of
-    // next; used to prune duplicates
-    private int _returnedLast;
-
-    // cached returned last for use in gotoMark
-    private int _cachedReturnedLast = END;
-
-    // cached heap size for use in gotoMark
-    private int _cachedHeapSize;
-
-
-    public DTMAxisIterator cloneIterator() {
-	_isRestartable = false;
-	final HeapNode[] heapCopy = new HeapNode[_heap.length];
-	try {
-	    MultiValuedNodeHeapIterator clone =
-                    (MultiValuedNodeHeapIterator)super.clone();
-
-            for (int i = 0; i < _free; i++) {
-                heapCopy[i] = _heap[i].cloneHeapNode();
-            }
-	    clone.setRestartable(false);
-	    clone._heap = heapCopy;
-	    return clone.reset();
-	} 
-	catch (CloneNotSupportedException e) {
-	    BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
-				      e.toString());
-	    return null;
-	}
-    }
-    
-    protected void addHeapNode(HeapNode node) {
-	if (_free == _size) {
-	    HeapNode[] newArray = new HeapNode[_size *= 2];
-	    System.arraycopy(_heap, 0, newArray, 0, _free);
-	    _heap = newArray;
-	}
-	_heapSize++;
-	_heap[_free++] = node;
-    }
-  
-    public int next() {
-	while (_heapSize > 0) {
-	    final int smallest = _heap[0]._node;
-	    if (smallest == END) { // iterator _heap[0] is done
-		if (_heapSize > 1) {
-		    // Swap first and last (iterator must be restartable)
-		    final HeapNode temp = _heap[0];
-		    _heap[0] = _heap[--_heapSize];
-		    _heap[_heapSize] = temp;
-		}
-		else {
-		    return END;
-		}
-	    }
-	    else if (smallest == _returnedLast) {	// duplicate
-		_heap[0].step(); // value consumed
-	    }
-	    else {
-		_heap[0].step(); // value consumed
-		heapify(0);
-		return returnNode(_returnedLast = smallest);
-	    }
-	    // fallthrough if not returned above
-	    heapify(0);
-	}
-	return END;
-    }
-  
-    public DTMAxisIterator setStartNode(int node) {
-	if (_isRestartable) {
-	    _startNode = node;
-	    for (int i = 0; i < _free; i++) {
-         	if(!_heap[i]._isStartSet){
-        	   _heap[i].setStartNode(node);
-        	   _heap[i].step();	// to get the first node
-        	   _heap[i]._isStartSet = true;
-        	}
-	    }
-	    // build heap
-	    for (int i = (_heapSize = _free)/2; i >= 0; i--) {
-		heapify(i);
-	    }
-	    _returnedLast = END;
-	    return resetPosition();
-	}
-	return this;
-    }
-
-    protected void init() {
-        for (int i =0; i < _free; i++) {
-            _heap[i] = null;
-        }
-
-        _heapSize = 0;
-        _free = 0;
-    }
-
-    /* Build a heap in document order. put the smallest node on the top. 
-     * "smallest node" means the node before other nodes in document order
-     */
-    private void heapify(int i) {
-	for (int r, l, smallest;;) {
-	    r = (i + 1) << 1; l = r - 1;
-	    smallest = l < _heapSize 
-		&& _heap[l].isLessThan(_heap[i]) ? l : i;
-	    if (r < _heapSize && _heap[r].isLessThan(_heap[smallest])) {
-		smallest = r;
-	    }
-	    if (smallest != i) {
-		final HeapNode temp = _heap[smallest];
-		_heap[smallest] = _heap[i];
-		_heap[i] = temp;
-		i = smallest;
-	    } else {
-		break;
-            }
-	}
-    }
-
-    public void setMark() {
-	for (int i = 0; i < _free; i++) {
-	    _heap[i].setMark();
-	}
-	_cachedReturnedLast = _returnedLast;    
-	_cachedHeapSize = _heapSize;
-    }
-
-    public void gotoMark() {
-	for (int i = 0; i < _free; i++) {
-	    _heap[i].gotoMark();
-	}
-	// rebuild heap after call last() function. fix for bug 20913
-	for (int i = (_heapSize = _cachedHeapSize)/2; i >= 0; i--) {
-	    heapify(i);
-	}
-        _returnedLast = _cachedReturnedLast;    
-    }
-
-    public DTMAxisIterator reset() {
-	for (int i = 0; i < _free; i++) {
-	    _heap[i].reset();
-	    _heap[i].step();
-	}
-
-	// build heap
-	for (int i = (_heapSize = _free)/2; i >= 0; i--) {
-	    heapify(i);
-	}
-
-	_returnedLast = END;
-	return resetPosition();
-    }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * $Id: UnionIterator.java 337874 2004-02-16 23:06:53Z minchau $
+ */
+
+package org.apache.xalan.xsltc.dom;
+
+import org.apache.xalan.xsltc.DOM;
+import org.apache.xalan.xsltc.runtime.BasisLibrary;
+import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+
+/**
+ * <p><code>MultiValuedNodeHeapIterator</code> takes a set of multi-valued
+ * heap nodes and produces a merged NodeSet in document order with duplicates
+ * removed.</p>
+ * <p>Each multi-valued heap node (which might be a
+ * {@link org.apache.xml.dtm.DTMAxisIterator}, but that's  not necessary)
+ * generates DTM node handles in document order.  The class
+ * maintains the multi-valued heap nodes in a heap, not surprisingly, sorted by
+ * the next DTM node handle available form the heap node.</p>
+ * <p>After a DTM node is pulled from the heap node that's at the top of the
+ * heap, the heap node is advanced to the next DTM node handle it makes
+ * available, and the heap nature of the heap is restored to ensure the next
+ * DTM node handle pulled is next in document order overall.
+ *
+ * @author Jacek Ambroziak
+ * @author Santiago Pericas-Geertsen
+ */
+public abstract class MultiValuedNodeHeapIterator extends DTMAxisIteratorBase {
+    /** wrapper for NodeIterators to support iterator
+	comparison on the value of their next() method
+    */
+
+    /**
+     * An abstract representation of a set of nodes that will be retrieved in
+     * document order.
+     */
+    public abstract class HeapNode implements Cloneable {
+	protected int _node, _markedNode;
+	protected boolean _isStartSet = false;
+		
+        /**
+         * Advance to the next node represented by this {@link HeapNode}
+         *
+         * @return the next DTM node.
+         */
+	public abstract int step();
+
+
+        /**
+         * Creates a deep copy of this {@link HeapNode}.  The clone is not
+         * reset from the current position of the original.
+         *
+         * @return the cloned heap node
+         */
+	public HeapNode cloneHeapNode() {
+            HeapNode clone;
+
+            try {
+                clone = (HeapNode) super.clone();
+            } catch (CloneNotSupportedException e) {
+                BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+                                          e.toString());
+                return null;
+            }
+
+	    clone._node = _node;
+	    clone._markedNode = _node;
+
+	    return clone;
+	}
+
+        /**
+         * Remembers the current node for the next call to {@link #gotoMark()}.
+         */
+	public void setMark() {
+	    _markedNode = _node;
+	}
+
+        /**
+         * Restores the current node remembered by {@link #setMark()}.
+         */
+	public void gotoMark() {
+	    _node = _markedNode;
+	}
+
+        /**
+         * Performs a comparison of the two heap nodes
+         *
+         * @param heapNode the heap node against which to compare
+         * @return <code>true</code> if and only if the current node for this
+         *         heap node is before the current node of the argument heap
+         *         node in document order.
+         */
+        public abstract boolean isLessThan(HeapNode heapNode);
+
+        /**
+         * Sets context with respect to which this heap node is evaluated.
+         *
+         * @param node The new context node
+         * @return a {@link HeapNode} which may or may not be the same as
+         *         this <code>HeapNode</code>.
+         */
+        public abstract HeapNode setStartNode(int node);
+
+        /**
+         * Reset the heap node back to its beginning.
+         *
+         * @return a {@link HeapNode} which may or may not be the same as
+         *         this <code>HeapNode</code>.
+         */
+        public abstract HeapNode reset();
+    } // end of HeapNode
+
+    private static final int InitSize = 8;
+  
+    private int        _heapSize = 0;
+    private int        _size = InitSize;
+    private HeapNode[] _heap = new HeapNode[InitSize];
+    private int        _free = 0;
+  
+    // Last node returned by this MultiValuedNodeHeapIterator to the caller of
+    // next; used to prune duplicates
+    private int _returnedLast;
+
+    // cached returned last for use in gotoMark
+    private int _cachedReturnedLast = END;
+
+    // cached heap size for use in gotoMark
+    private int _cachedHeapSize;
+
+
+    public DTMAxisIterator cloneIterator() {
+	_isRestartable = false;
+	final HeapNode[] heapCopy = new HeapNode[_heap.length];
+	try {
+	    MultiValuedNodeHeapIterator clone =
+                    (MultiValuedNodeHeapIterator)super.clone();
+
+            for (int i = 0; i < _free; i++) {
+                heapCopy[i] = _heap[i].cloneHeapNode();
+            }
+	    clone.setRestartable(false);
+	    clone._heap = heapCopy;
+	    return clone.reset();
+	} 
+	catch (CloneNotSupportedException e) {
+	    BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+				      e.toString());
+	    return null;
+	}
+    }
+    
+    protected void addHeapNode(HeapNode node) {
+	if (_free == _size) {
+	    HeapNode[] newArray = new HeapNode[_size *= 2];
+	    System.arraycopy(_heap, 0, newArray, 0, _free);
+	    _heap = newArray;
+	}
+	_heapSize++;
+	_heap[_free++] = node;
+    }
+  
+    public int next() {
+	while (_heapSize > 0) {
+	    final int smallest = _heap[0]._node;
+	    if (smallest == END) { // iterator _heap[0] is done
+		if (_heapSize > 1) {
+		    // Swap first and last (iterator must be restartable)
+		    final HeapNode temp = _heap[0];
+		    _heap[0] = _heap[--_heapSize];
+		    _heap[_heapSize] = temp;
+		}
+		else {
+		    return END;
+		}
+	    }
+	    else if (smallest == _returnedLast) {	// duplicate
+		_heap[0].step(); // value consumed
+	    }
+	    else {
+		_heap[0].step(); // value consumed
+		heapify(0);
+		return returnNode(_returnedLast = smallest);
+	    }
+	    // fallthrough if not returned above
+	    heapify(0);
+	}
+	return END;
+    }
+  
+    public DTMAxisIterator setStartNode(int node) {
+	if (_isRestartable) {
+	    _startNode = node;
+	    for (int i = 0; i < _free; i++) {
+         	if(!_heap[i]._isStartSet){
+        	   _heap[i].setStartNode(node);
+        	   _heap[i].step();	// to get the first node
+        	   _heap[i]._isStartSet = true;
+        	}
+	    }
+	    // build heap
+	    for (int i = (_heapSize = _free)/2; i >= 0; i--) {
+		heapify(i);
+	    }
+	    _returnedLast = END;
+	    return resetPosition();
+	}
+	return this;
+    }
+
+    protected void init() {
+        for (int i =0; i < _free; i++) {
+            _heap[i] = null;
+        }
+
+        _heapSize = 0;
+        _free = 0;
+    }
+
+    /* Build a heap in document order. put the smallest node on the top. 
+     * "smallest node" means the node before other nodes in document order
+     */
+    private void heapify(int i) {
+	for (int r, l, smallest;;) {
+	    r = (i + 1) << 1; l = r - 1;
+	    smallest = l < _heapSize 
+		&& _heap[l].isLessThan(_heap[i]) ? l : i;
+	    if (r < _heapSize && _heap[r].isLessThan(_heap[smallest])) {
+		smallest = r;
+	    }
+	    if (smallest != i) {
+		final HeapNode temp = _heap[smallest];
+		_heap[smallest] = _heap[i];
+		_heap[i] = temp;
+		i = smallest;
+	    } else {
+		break;
+            }
+	}
+    }
+
+    public void setMark() {
+	for (int i = 0; i < _free; i++) {
+	    _heap[i].setMark();
+	}
+	_cachedReturnedLast = _returnedLast;    
+	_cachedHeapSize = _heapSize;
+    }
+
+    public void gotoMark() {
+	for (int i = 0; i < _free; i++) {
+	    _heap[i].gotoMark();
+	}
+	// rebuild heap after call last() function. fix for bug 20913
+	for (int i = (_heapSize = _cachedHeapSize)/2; i >= 0; i--) {
+	    heapify(i);
+	}
+        _returnedLast = _cachedReturnedLast;    
+    }
+
+    public DTMAxisIterator reset() {
+	for (int i = 0; i < _free; i++) {
+	    _heap[i].reset();
+	    _heap[i].step();
+	}
+
+	// build heap
+	for (int i = (_heapSize = _free)/2; i >= 0; i--) {
+	    heapify(i);
+	}
+
+	_returnedLast = END;
+	return resetPosition();
+    }
+
+}

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeCounter.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeCounter.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeCounter.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeCounter.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeIteratorBase.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeIteratorBase.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeIteratorBase.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeIteratorBase.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NthIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NthIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NthIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/NthIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ObjectFactory.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ObjectFactory.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ObjectFactory.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ObjectFactory.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SAXImpl.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SAXImpl.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SAXImpl.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SAXImpl.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SecuritySupport.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SecuritySupport.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SecuritySupport.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SecuritySupport.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2002-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SecuritySupport12.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SecuritySupport12.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SecuritySupport12.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SecuritySupport12.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2002-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SingleNodeCounter.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SingleNodeCounter.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SingleNodeCounter.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SingleNodeCounter.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SingletonIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SingletonIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SingletonIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SingletonIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SortSettings.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SortSettings.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SortSettings.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SortSettings.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SortingIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SortingIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SortingIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/SortingIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/StepIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/StepIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/StepIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/StepIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/UnionIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/UnionIterator.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/UnionIterator.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/UnionIterator.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java?view=diff&rev=468651&r1=468650&r2=468651
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java Sat Oct 28 00:04:25 2006
@@ -1,7 +1,9 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *



---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org


Mime
View raw message