From 5b31d8ba4a4ec7cd948e18f338d3fe4f2037aa90 Mon Sep 17 00:00:00 2001
From: Julian Hyde <julianhyde@gmail.com>
Date: Thu, 5 Jan 2012 23:27:27 +0000
Subject: [PATCH] Apache Software License, version 2.0.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@482 c6a108a4-781c-0410-a6c6-c2d559e19af0
---
 LICENSE                                       | 202 ++++++++++++++
 LICENSE.html                                  | 259 ------------------
 NOTICE                                        |  22 ++
 build.properties                              |  23 +-
 build.xml                                     |  75 +++--
 buildOnJdk.bat                                |  16 ++
 buildOnJdk.sh                                 |  19 ++
 checkFile.awk                                 |  23 +-
 checkFile.sh                                  |  31 ++-
 doc/deployDoc.sh                              |  23 +-
 doc/index.html                                | 122 +++++----
 foodmart/FoodMart.xml                         |  25 +-
 ivy-tck.xml                                   |  24 +-
 ivy-xmla.xml                                  |  24 +-
 ivy.xml                                       |  24 +-
 src/org/olap4j/AllocationPolicy.java          |  22 +-
 src/org/olap4j/Axis.java                      |  22 +-
 src/org/olap4j/Cell.java                      |  22 +-
 src/org/olap4j/CellSet.java                   |  22 +-
 src/org/olap4j/CellSetAxis.java               |  22 +-
 src/org/olap4j/CellSetAxisMetaData.java       |  22 +-
 src/org/olap4j/CellSetListener.java           |  22 +-
 src/org/olap4j/CellSetMetaData.java           |  22 +-
 src/org/olap4j/OlapConnection.java            |  22 +-
 src/org/olap4j/OlapDataSource.java            |  23 +-
 src/org/olap4j/OlapDatabaseMetaData.java      |  22 +-
 src/org/olap4j/OlapException.java             |  22 +-
 src/org/olap4j/OlapParameterMetaData.java     |  22 +-
 src/org/olap4j/OlapStatement.java             |  22 +-
 src/org/olap4j/OlapWrapper.java               |  22 +-
 src/org/olap4j/Position.java                  |  22 +-
 src/org/olap4j/PreparedOlapStatement.java     |  22 +-
 src/org/olap4j/Scenario.java                  |  22 +-
 .../driver/xmla/DeferredNamedListImpl.java    |  23 +-
 .../olap4j/driver/xmla/EmptyResultSet.java    |  23 +-
 src/org/olap4j/driver/xmla/Factory.java       |  23 +-
 .../olap4j/driver/xmla/FactoryJdbc3Impl.java  |  23 +-
 .../olap4j/driver/xmla/FactoryJdbc41Impl.java |  23 +-
 .../olap4j/driver/xmla/FactoryJdbc4Impl.java  |  23 +-
 .../olap4j/driver/xmla/FactoryJdbc4Plus.java  |  23 +-
 .../olap4j/driver/xmla/MetadataReader.java    |  23 +-
 src/org/olap4j/driver/xmla/XmlaHelper.java    |  23 +-
 .../olap4j/driver/xmla/XmlaOlap4jCatalog.java |  22 +-
 .../olap4j/driver/xmla/XmlaOlap4jCell.java    |  23 +-
 .../driver/xmla/XmlaOlap4jCellProperty.java   |  23 +-
 .../olap4j/driver/xmla/XmlaOlap4jCellSet.java |  23 +-
 .../driver/xmla/XmlaOlap4jCellSetAxis.java    |  23 +-
 .../xmla/XmlaOlap4jCellSetAxisMetaData.java   |  23 +-
 .../xmla/XmlaOlap4jCellSetMemberProperty.java |  23 +-
 .../xmla/XmlaOlap4jCellSetMetaData.java       |  23 +-
 .../driver/xmla/XmlaOlap4jConnection.java     |  23 +-
 .../olap4j/driver/xmla/XmlaOlap4jCube.java    |  23 +-
 .../driver/xmla/XmlaOlap4jDatabase.java       |  23 +-
 .../xmla/XmlaOlap4jDatabaseMetaData.java      |  23 +-
 .../driver/xmla/XmlaOlap4jDimension.java      |  23 +-
 .../olap4j/driver/xmla/XmlaOlap4jDriver.java  |  22 +-
 .../olap4j/driver/xmla/XmlaOlap4jElement.java |  25 +-
 .../driver/xmla/XmlaOlap4jHierarchy.java      |  23 +-
 .../olap4j/driver/xmla/XmlaOlap4jLevel.java   |  23 +-
 .../olap4j/driver/xmla/XmlaOlap4jMeasure.java |  23 +-
 .../olap4j/driver/xmla/XmlaOlap4jMember.java  |  23 +-
 .../driver/xmla/XmlaOlap4jMemberBase.java     |  23 +-
 .../driver/xmla/XmlaOlap4jNamedSet.java       |  23 +-
 .../driver/xmla/XmlaOlap4jPosition.java       |  23 +-
 .../driver/xmla/XmlaOlap4jPositionMember.java |  23 +-
 .../xmla/XmlaOlap4jPreparedStatement.java     |  23 +-
 .../driver/xmla/XmlaOlap4jProperty.java       |  23 +-
 .../olap4j/driver/xmla/XmlaOlap4jSchema.java  |  23 +-
 .../driver/xmla/XmlaOlap4jServerInfos.java    |  24 +-
 .../driver/xmla/XmlaOlap4jStatement.java      |  23 +-
 .../olap4j/driver/xmla/XmlaOlap4jUtil.java    |  23 +-
 .../driver/xmla/cache/XmlaOlap4jCache.java    |  22 +-
 .../xmla/cache/XmlaOlap4jCacheElement.java    |  22 +-
 .../XmlaOlap4jConcurrentMemoryCache.java      |  28 +-
 .../XmlaOlap4jInvalidStateException.java      |  22 +-
 .../cache/XmlaOlap4jNamedMemoryCache.java     |  22 +-
 .../xmla/cache/XmlaOlap4jShaEncoder.java      |  22 +-
 .../proxy/XmlaOlap4jAbstractHttpProxy.java    |  26 +-
 .../xmla/proxy/XmlaOlap4jCachedProxy.java     |  22 +-
 .../xmla/proxy/XmlaOlap4jCookieManager.java   |  22 +-
 .../xmla/proxy/XmlaOlap4jHttpProxy.java       |  22 +-
 .../driver/xmla/proxy/XmlaOlap4jProxy.java    |  22 +-
 .../xmla/proxy/XmlaOlap4jProxyException.java  |  24 +-
 src/org/olap4j/impl/AbstractNamedList.java    |  22 +-
 src/org/olap4j/impl/ArrayMap.java             |  23 +-
 src/org/olap4j/impl/ArrayNamedListImpl.java   |  23 +-
 src/org/olap4j/impl/Base64.java               |  22 +-
 src/org/olap4j/impl/Bug.java                  |  23 +-
 src/org/olap4j/impl/ConnectStringParser.java  |  23 +-
 src/org/olap4j/impl/CoordinateIterator.java   |  22 +-
 src/org/olap4j/impl/IdentifierParser.java     |  23 +-
 src/org/olap4j/impl/LcidLocale.java           |  23 +-
 src/org/olap4j/impl/Named.java                |  22 +-
 src/org/olap4j/impl/NamedListImpl.java        |  22 +-
 src/org/olap4j/impl/Olap4jUtil.java           |  23 +-
 src/org/olap4j/impl/Olap4jUtilCompatible.java |  22 +-
 .../impl/Olap4jUtilCompatibleJdk14.java       |  22 +-
 .../impl/Olap4jUtilCompatibleJdk15.java       |  22 +-
 src/org/olap4j/impl/Pair.java                 |  23 +-
 .../olap4j/impl/UnmodifiableArrayList.java    |  22 +-
 src/org/olap4j/impl/UnmodifiableArrayMap.java |  22 +-
 src/org/olap4j/layout/CellSetFormatter.java   |  22 +-
 .../layout/RectangularCellSetFormatter.java   |  22 +-
 .../layout/TraditionalCellSetFormatter.java   |  22 +-
 src/org/olap4j/mdx/AxisNode.java              |  22 +-
 src/org/olap4j/mdx/CallNode.java              |  22 +-
 src/org/olap4j/mdx/CubeNode.java              |  22 +-
 .../olap4j/mdx/DefaultMdxValidatorImpl.java   |  22 +-
 src/org/olap4j/mdx/DimensionNode.java         |  22 +-
 src/org/olap4j/mdx/HierarchyNode.java         |  22 +-
 src/org/olap4j/mdx/IdentifierNode.java        |  22 +-
 src/org/olap4j/mdx/IdentifierSegment.java     |  22 +-
 src/org/olap4j/mdx/KeySegment.java            |  22 +-
 src/org/olap4j/mdx/LevelNode.java             |  22 +-
 src/org/olap4j/mdx/LiteralNode.java           |  22 +-
 src/org/olap4j/mdx/MdxUtil.java               |  22 +-
 src/org/olap4j/mdx/MemberNode.java            |  22 +-
 src/org/olap4j/mdx/NameSegment.java           |  22 +-
 src/org/olap4j/mdx/ParameterNode.java         |  22 +-
 src/org/olap4j/mdx/ParseRegion.java           |  22 +-
 src/org/olap4j/mdx/ParseTreeNode.java         |  22 +-
 src/org/olap4j/mdx/ParseTreeVisitor.java      |  22 +-
 src/org/olap4j/mdx/ParseTreeWriter.java       |  22 +-
 src/org/olap4j/mdx/PropertyValueNode.java     |  22 +-
 src/org/olap4j/mdx/Quoting.java               |  22 +-
 src/org/olap4j/mdx/SelectNode.java            |  22 +-
 src/org/olap4j/mdx/Syntax.java                |  22 +-
 src/org/olap4j/mdx/WithMemberNode.java        |  24 +-
 src/org/olap4j/mdx/WithSetNode.java           |  22 +-
 .../olap4j/mdx/parser/MdxParseException.java  |  22 +-
 src/org/olap4j/mdx/parser/MdxParser.java      |  22 +-
 .../olap4j/mdx/parser/MdxParserFactory.java   |  22 +-
 src/org/olap4j/mdx/parser/MdxValidator.java   |  22 +-
 .../mdx/parser/impl/DefaultMdxParser.cup      |  23 +-
 .../mdx/parser/impl/DefaultMdxParserImpl.java |  22 +-
 src/org/olap4j/mdx/parser/impl/Scanner.java   |  22 +-
 .../olap4j/mdx/parser/impl/StringScanner.java |  22 +-
 src/org/olap4j/metadata/Catalog.java          |  22 +-
 src/org/olap4j/metadata/Cube.java             |  22 +-
 src/org/olap4j/metadata/Database.java         |  22 +-
 src/org/olap4j/metadata/Datatype.java         |  22 +-
 src/org/olap4j/metadata/DictionaryImpl.java   |  22 +-
 src/org/olap4j/metadata/Dimension.java        |  22 +-
 src/org/olap4j/metadata/Hierarchy.java        |  22 +-
 src/org/olap4j/metadata/Level.java            |  22 +-
 src/org/olap4j/metadata/Measure.java          |  22 +-
 src/org/olap4j/metadata/Member.java           |  22 +-
 src/org/olap4j/metadata/MetadataElement.java  |  22 +-
 src/org/olap4j/metadata/NamedList.java        |  22 +-
 src/org/olap4j/metadata/NamedSet.java         |  22 +-
 src/org/olap4j/metadata/Property.java         |  22 +-
 src/org/olap4j/metadata/Schema.java           |  22 +-
 src/org/olap4j/metadata/XmlaConstant.java     |  23 +-
 src/org/olap4j/metadata/XmlaConstants.java    |  22 +-
 src/org/olap4j/query/AbstractSelection.java   |  22 +-
 src/org/olap4j/query/LevelSelectionImpl.java  |  24 +-
 src/org/olap4j/query/MemberSelectionImpl.java |  24 +-
 src/org/olap4j/query/Olap4jNodeConverter.java |  22 +-
 src/org/olap4j/query/Query.java               |  22 +-
 src/org/olap4j/query/QueryAxis.java           |  22 +-
 src/org/olap4j/query/QueryDimension.java      |  22 +-
 src/org/olap4j/query/QueryEvent.java          |  22 +-
 src/org/olap4j/query/QueryNode.java           |  24 +-
 src/org/olap4j/query/QueryNodeImpl.java       |  22 +-
 src/org/olap4j/query/QueryNodeListener.java   |  22 +-
 src/org/olap4j/query/Selection.java           |  22 +-
 src/org/olap4j/query/SelectionFactory.java    |  22 +-
 src/org/olap4j/query/SortOrder.java           |  22 +-
 src/org/olap4j/sample/PaloConnection.java     |  22 +-
 src/org/olap4j/sample/SimpleQuerySample.java  |  22 +-
 src/org/olap4j/transform/AxisTransform.java   |  22 +-
 .../DrillDownOnPositionTransform.java         |  22 +-
 .../transform/DrillReplaceTransform.java      |  22 +-
 src/org/olap4j/transform/MdxHelper.java       |  22 +-
 .../olap4j/transform/MdxQueryTransform.java   |  22 +-
 src/org/olap4j/transform/Quax.java            |  22 +-
 .../transform/RollUpLevelTransform.java       |  22 +-
 .../transform/StandardTransformLibrary.java   |  22 +-
 src/org/olap4j/transform/TransformUtil.java   |  22 +-
 src/org/olap4j/transform/TreeNode.java        |  22 +-
 .../olap4j/transform/TreeNodeCallback.java    |  22 +-
 src/org/olap4j/type/BooleanType.java          |  22 +-
 src/org/olap4j/type/CubeType.java             |  22 +-
 src/org/olap4j/type/DecimalType.java          |  22 +-
 src/org/olap4j/type/DimensionType.java        |  22 +-
 src/org/olap4j/type/HierarchyType.java        |  22 +-
 src/org/olap4j/type/LevelType.java            |  22 +-
 src/org/olap4j/type/MemberType.java           |  22 +-
 src/org/olap4j/type/NullType.java             |  22 +-
 src/org/olap4j/type/NumericType.java          |  22 +-
 src/org/olap4j/type/ScalarType.java           |  22 +-
 src/org/olap4j/type/SetType.java              |  22 +-
 src/org/olap4j/type/StringType.java           |  22 +-
 src/org/olap4j/type/SymbolType.java           |  22 +-
 src/org/olap4j/type/TupleType.java            |  22 +-
 src/org/olap4j/type/Type.java                 |  22 +-
 src/org/olap4j/type/TypeUtil.java             |  22 +-
 subfloor.xml                                  |  36 +--
 test.properties                               |  23 +-
 testsrc/org/olap4j/CellSetFormatterTest.java  |  22 +-
 testsrc/org/olap4j/ConnectionTest.java        |  22 +-
 testsrc/org/olap4j/MetadataTest.java          |  23 +-
 testsrc/org/olap4j/OlapTest.java              |  23 +-
 testsrc/org/olap4j/OlapTreeTest.java          |  22 +-
 testsrc/org/olap4j/RemoteXmlaTester.java      |  23 +-
 testsrc/org/olap4j/XmlaConnectionTest.java    |  29 +-
 testsrc/org/olap4j/XmlaTester.java            |  25 +-
 .../driver/xmla/cache/XmlaDatabaseCache.java  |  25 +-
 .../driver/xmla/cache/XmlaShaEncoderTest.java |  22 +-
 .../xmla/proxy/XmlaCachedProxyTest.java       |  23 +-
 .../xmla/proxy/XmlaCookieManagerTest.java     |  26 +-
 testsrc/org/olap4j/impl/Base64Test.java       |  22 +-
 .../olap4j/impl/ConnectStringParserTest.java  |  23 +-
 testsrc/org/olap4j/impl/Olap4jUtilTest.java   |  23 +-
 testsrc/org/olap4j/mdx/MdxTest.java           |  23 +-
 testsrc/org/olap4j/test/ArrayMapTest.java     |  23 +-
 testsrc/org/olap4j/test/ParserTest.java       |  22 +-
 testsrc/org/olap4j/test/TestContext.java      |  22 +-
 .../org/olap4j/transform/TransformTest.java   |  24 +-
 219 files changed, 3866 insertions(+), 1646 deletions(-)
 create mode 100644 LICENSE
 delete mode 100755 LICENSE.html
 create mode 100644 NOTICE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/LICENSE.html b/LICENSE.html
deleted file mode 100755
index 98b91a5..0000000
--- a/LICENSE.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head><body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..dd7d6e5
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,22 @@
+olap4j
+Copyright (C) 2005-2012, Julian Hyde
+
+This product includes software developed by Julian Hyde
+(http://www.hydromatic.net).
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this software 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.
+
+subfloor.xml was developed by Pentaho Corporation (http://www.pentaho.com).
+
+Portions of this product were derived from the Mondrian OLAP Engine
+(http://mondrian.pentaho.org).
diff --git a/build.properties b/build.properties
index 2a7ecbc..4743a99 100644
--- a/build.properties
+++ b/build.properties
@@ -1,10 +1,21 @@
+#
 # $Id$
-# This software is subject to the terms of the Eclipse Public License v1.0
-# Agreement, available at the following URL:
-# http://www.eclipse.org/legal/epl-v10.html.
-# Copyright (C) 2007-2011 Julian Hyde and others.
-# All Rights Reserved.
-# You must accept the terms of that agreement to use this software.
+#
+# Licensed to Julian Hyde under one or more contributor license
+# agreements. See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.
+#
+# Julian Hyde 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.
 #
 # Modify this file to override build settings. It is read by ant's build.xml.
 # See also 'test.properties', which contains settings for the regression
diff --git a/build.xml b/build.xml
index 49026b2..d3d4ed5 100644
--- a/build.xml
+++ b/build.xml
@@ -1,11 +1,21 @@
 <!--
     == $Id$
-    == This software is subject to the terms of the Eclipse Public License v1.0
-    == Agreement, available at the following URL:
-    == http://www.eclipse.org/legal/epl-v10.html.
-    == Copyright (C) 2006-2011 Julian Hyde and others.
-    == All Rights Reserved.
-    == You must accept the terms of that agreement to use this software.
+    ==
+    == Licensed to Julian Hyde under one or more contributor license
+    == agreements. See the NOTICE file distributed with this work for
+    == additional information regarding copyright ownership.
+    ==
+    == Julian Hyde 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.
     -->
 <project name="olap4j" basedir="." default="dist" xmlns:ivy="antlib:org.apache.ivy.ant">
     <property file="${basedir}/test.properties"/>
@@ -73,13 +83,14 @@ ${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParserSym.java" />
         depends="clean,version-properties,jar,tck-jar,xmla-jar,javadoc,javadoc-pdf,jar-jdk14,source.zip"
         description="Creates a distribution">
         <zip zipfile="${dist.dir}/${zip.filename}">
-            <zipfileset dir="${basedir}/doc" prefix="${ivy.artifact.id}-${project.revision}/doc"
-                includes="**/*" />
             <zipfileset dir="${basedir}" prefix="${ivy.artifact.id}-${project.revision}"
                 includes="
-LICENSE.html,
+LICENSE,
+NOTICE,
 README.txt,
 VERSION.txt" />
+            <zipfileset dir="${basedir}/doc" prefix="${ivy.artifact.id}-${project.revision}/doc"
+                includes="**/*" />
             <zipfileset dir="${javadoc.dir}" prefix="${ivy.artifact.id}-${project.revision}/doc/api"
                 includes="**/*" />
             <zipfileset dir="${dist.dir}" prefix="${ivy.artifact.id}-${project.revision}/lib" includes="olap4j-*.jar" />
@@ -116,44 +127,47 @@ olap4j_api.pdf"
     <target name="jar" depends="init, compile.pre, checkIsJdk15, compileJdk15, compileJdk16, compileJdk17, compile, compile-tests, set-build.id, generate.manifest"
         description="Jars up the bin directory after a compile">
         <zip destfile="${dist.dir}/${ivy.artifact.id}-${project.revision}.jar">
+            <zipfileset dir="${basedir}" prefix=""
+                includes="
+LICENSE,
+NOTICE,
+README.txt,
+VERSION.txt" />
             <zipfileset dir="${classes.dir}" prefix=""
                 includes="**/*"
                 excludes="
 org/olap4j/driver/**,
 META-INF/**"/>
-            <zipfileset dir="${basedir}" prefix=""
-                includes="
-LICENSE.html,
-README.txt,
-VERSION.txt" />
         </zip>
     </target>
 
     <target name="xmla-jar" depends="jar"
         description="Jars up the bin directory after a compile">
         <zip destfile="${dist.dir}/${ivy.artifact.id}-xmla-${project.revision}.jar">
-            <zipfileset dir="${classes.dir}" prefix=""
-                includes="
-org/olap4j/driver/**,
-META-INF/**"/>
             <zipfileset dir="${basedir}" prefix=""
                 includes="
-LICENSE.html,
+LICENSE,
+NOTICE,
 README.txt,
 VERSION.txt" />
+            <zipfileset dir="${classes.dir}" prefix=""
+                includes="
+org/olap4j/driver/**,
+META-INF/**"/>
         </zip>
     </target>
 
     <target name="tck-jar" depends="jar"
         description="Jars up the Test Compatibility Kit (TCK) after a compile">
         <zip destfile="${dist.dir}/${ivy.artifact.id}-tck-${project.revision}.jar">
-            <zipfileset dir="${testclasses.dir}" prefix="" includes="**/*"
-                excludes="jndi.properties" />
             <zipfileset dir="${basedir}" prefix=""
                 includes="
-LICENSE.html,
+LICENSE,
+NOTICE,
 README.txt,
 VERSION.txt" />
+            <zipfileset dir="${testclasses.dir}" prefix="" includes="**/*"
+                excludes="jndi.properties" />
         </zip>
     </target>
 
@@ -165,7 +179,7 @@ VERSION.txt" />
             <arg line="/c .\buildOnJdk.bat jdk1.5 -Dskip.download=true compile.compile"/>
         </exec>
     </target>
-    
+
     <target name="compileJdk16">
         <exec osfamily="unix" executable="${unix.script}">
             <arg line="jdk1.6 -Dskip.download=true compile.compile"/>
@@ -174,7 +188,7 @@ VERSION.txt" />
             <arg line="/c .\buildOnJdk.bat jdk1.6 -Dskip.download=true compile.compile"/>
         </exec>
     </target>
-    
+
     <target name="compileJdk17">
         <exec osfamily="unix" executable="${unix.script}">
             <arg line="jdk1.7 -Dskip.download=true compile.compile"/>
@@ -188,6 +202,12 @@ VERSION.txt" />
         <zip zipfile="${dist.dir}/${source.zip.filename}">
             <zipfileset dir="${basedir}" prefix="${ivy.artifact.id}-${project.revision}"
                     includes="
+LICENSE,
+NOTICE,
+README.txt,
+VERSION.txt" />
+            <zipfileset dir="${basedir}" prefix="${ivy.artifact.id}-${project.revision}"
+                    includes="
 src/**,
 testsrc/**,
 foodmart/*.zip,
@@ -209,11 +229,8 @@ ivy-xmla.xml,
 ivy-tck.xml,
 ivy-jdk14.xml,
 ivysettings.xml,
-LICENSE.html,
-README.txt,
 subfloor.xml,
-test.properties,
-VERSION.txt" />
+test.properties" />
         </zip>
     </target>
 
@@ -251,7 +268,7 @@ class XmlaOlap4jDriverVersion {
 
     <target name="clean-hsql">
         <delete includeemptydirs="false">
-            <fileset 
+            <fileset
                 dir="${basedir}/foodmart"
                 defaultexcludes="true">
                 <exclude name="foodmart.zip"/>
diff --git a/buildOnJdk.bat b/buildOnJdk.bat
index 6baa862..31fbfa4 100755
--- a/buildOnJdk.bat
+++ b/buildOnJdk.bat
@@ -1,5 +1,21 @@
 @echo off
 rem $Id: //open/mondrian/buildOnJdk.bat#2 $
+rem
+rem Licensed to Julian Hyde under one or more contributor license
+rem agreements. See the NOTICE file distributed with this work for
+rem additional information regarding copyright ownership.
+rem
+rem Julian Hyde licenses this file to you under the Apache License,
+rem Version 2.0 (the "License"); you may not use this file except in
+rem compliance with the License. You may obtain a copy of the License at:
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
 
 rem **** This program takes 1 argument and a series of other arguments to pass to Ant.
 rem ****  - buildOnJdk.bat [jdk version] [ant arguments]
diff --git a/buildOnJdk.sh b/buildOnJdk.sh
index 3ed49f1..b0d1e64 100755
--- a/buildOnJdk.sh
+++ b/buildOnJdk.sh
@@ -1,4 +1,23 @@
+#
 # $Id: //open/mondrian/buildOnJdk.sh#2 $
+#
+# Licensed to Julian Hyde under one or more contributor license
+# agreements. See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.
+#
+# Julian Hyde 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.
+#
+# ==============================================================================
 # Called recursively from 'ant release' to build the files which can only be
 # built under a particular JDK version.
 #
diff --git a/checkFile.awk b/checkFile.awk
index a25e3fd..fb78cc1 100644
--- a/checkFile.awk
+++ b/checkFile.awk
@@ -1,6 +1,25 @@
 #!/bin/gawk
-# $Id: //open/util/bin/checkFile#13 $
+# $Id: $
+#
+# Licensed to Julian Hyde under one or more contributor license
+# agreements. See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.
+#
+# Julian Hyde 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.
+
+# ==============================================================================
 # Checks that a file is valid.
+# See checkFile.sh.
 
 function error(fname, linum, msg) {
     printf "%s:%d: %s\n", fname, linum, msg;
@@ -214,7 +233,7 @@ FNR == 1 {
     if (thisPackage ~ /^mondrian.*/ && thisImport ~ /^mondrian.*/ \
         || thisPackage ~ /^org.olap4j.*/ && thisImport ~ /^org.olap4j.*/)
     {
-        importGroup = "a";       
+        importGroup = "a";
     } else if (thisImport ~ /^static/) {
         importGroup = "z";
     } else if (thisImport ~ /^java.*/) {
diff --git a/checkFile.sh b/checkFile.sh
index bc4b0e4..35b4fa5 100755
--- a/checkFile.sh
+++ b/checkFile.sh
@@ -1,18 +1,28 @@
 #!/bin/bash
 # $Id: //open/mondrian-release/3.2/bin/checkFile.sh#2 $
+#
+# Licensed to Julian Hyde under one or more contributor license
+# agreements. See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.
+#
+# Julian Hyde 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.
+#
+# ==============================================================================
 # Checks that a file is valid.
-# Used by perforce submit trigger, via runTrigger.
 # The file is deemed to be valid if this command produces no output.
 #
 # Usage:
-#   checkFile [ --depotPath <depotPath> ] <file> 
-#
-# runTrigger uses first form, with a temporary file, e.g.
-#   checkFile --depotPath //depot/src/foo/Bar.java /tmp/foo.txt
-#
-# The second form is useful for checking files in the client before you
-# try to submit them:
-#   checkFile src/foo/Bar.java
+#   checkFile [ --depotPath <depotPath> ] <file>
 #
 
 usage() {
@@ -273,4 +283,5 @@ fi
 
 exit $status
 
-# End checkFile
+# End checkFile.sh
+
diff --git a/doc/deployDoc.sh b/doc/deployDoc.sh
index ba03cfe..bbabc3b 100644
--- a/doc/deployDoc.sh
+++ b/doc/deployDoc.sh
@@ -1,12 +1,23 @@
 #!/bin/sh
 # $Id$
-# This software is subject to the terms of the Eclipse Public License v1.0
-# Agreement, available at the following URL:
-# http://www.eclipse.org/legal/epl-v10.html.
-# Copyright (C) 2005-2009 Julian Hyde
-# All Rights Reserved.
-# You must accept the terms of that agreement to use this software.
 #
+# Licensed to Julian Hyde under one or more contributor license
+# agreements. See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.
+#
+# Julian Hyde 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.
+#
+# ==============================================================================
 # This is a script to deploy olap4j's website.
 # Only the release manager (jhyde) should run this script.
 
diff --git a/doc/index.html b/doc/index.html
index 6affcc2..05f2d97 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -4,21 +4,31 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <!--
   == $Id$
-  == This software is subject to the terms of the Eclipse Public License v1.0
-  == Agreement, available at the following URL:
-  == http://www.eclipse.org/legal/epl-v10.html.
-  == Copyright (C) 2006-2011 Julian Hyde and others.
-  == All Rights Reserved.
-  == You must accept the terms of that agreement to use this software.
+  ==
+  == Licensed to Julian Hyde under one or more contributor license
+  == agreements. See the NOTICE file distributed with this work for
+  == additional information regarding copyright ownership.
+  ==
+  == Julian Hyde 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.
   -->
 <title>olap4j: Open Java API for OLAP</title>
 <style type="text/css">
-  body { 
-  color: #000000; 
-  font-family: Arial, sans-serif; 
+  body {
+  color: #000000;
+  font-family: Arial, sans-serif;
   font-size: .85em;
   }
-  
+
   a {
     font-family: Tahoma, Helvetica, sans-serif;
     color: #949e3e;
@@ -37,7 +47,7 @@
     font-family: Tahoma, Helvetica, sans-serif;
     color: #907c6c;
 }
-  
+
   ul {
     margin-left: 0px;
     margin-top: 0px;
@@ -47,83 +57,83 @@
     list-style-image: url(images/bullet_gray.png);
     list-style-position: inside;
     }
-  
+
   p { margin: 0px; }
-  
-  .logo { 
-  padding: 0px 0px 10px 0px; 
+
+  .logo {
+  padding: 0px 0px 10px 0px;
   }
-  
+
   .banner_title {
   padding: 42px 0px 0px 10px;
   }
-  
-  .col_spacer { 
+
+  .col_spacer {
   width: 15px;
   height: 15px;
   }
-  
+
   h4 {
   font-size: 1.2em;
   color:#004263;
   font-weight:bold;
   margin: 20px 0px 0px 0px;
   }
-  
+
   h5 {
   font-size: .85em;
   color:#000000;
   font-weight:bold;
   margin: 20px 0px 0px 0px;
   }
-    
-  .home_box { 
-  background-color:#004263; 
-  background-image:url(images/curve_bg.png); 
+
+  .home_box {
+  background-color:#004263;
+  background-image:url(images/curve_bg.png);
   }
-  
-  .home_box_center { 
-  background-image:url(images/home_box_bg.png); 
+
+  .home_box_center {
+  background-image:url(images/home_box_bg.png);
   background-repeat: no-repeat;
   background-position: top right;
   padding: 0px 0px 10px 0px;
   }
-  
-  .home_box_spacer { 
-  background-color:#004263; 
+
+  .home_box_spacer {
+  background-color:#004263;
   width: 11px;
   height: 11px;
-  background-image:url(images/curve_bg.png); 
+  background-image:url(images/curve_bg.png);
   }
-  
-  p.box_header { 
-  color: #ffffff; 
-  font-size: 1.45em; 
+
+  p.box_header {
+  color: #ffffff;
+  font-size: 1.45em;
   margin-top: 10px;
   width: 385px;
   font-weight:bold;
   }
-  
-  p.box_subheader { 
+
+  p.box_subheader {
   color: #ffffff;
-  font-size: 1.35em; 
+  font-size: 1.35em;
   }
-  
+
   .participation_bg {
   background-color: #c0c0c0;
   padding: 10px 15px 1px 15px;
   margin: 15px 0px 10px 0px;
   width: 170px;
   }
-  
+
   .copyright {
-  border-top: 1px solid #004263; 
-  font: normal .75em Arial, Helvetica, sans-serif; 
-  color:#000000; 
-  text-align:center; 
+  border-top: 1px solid #004263;
+  font: normal .75em Arial, Helvetica, sans-serif;
+  color:#000000;
+  text-align:center;
   padding: 5px 0px 5px 0px;
   }
-  
+
 </style>
 </head>
 
@@ -143,20 +153,20 @@
         <tr>
           <td class="home_box"><img src="images/spacer.png" class="home_box_spacer"/></td>
           <td class="home_box"><div class="home_box_center"><p class="box_header">
-                        olap4j is an open Java 
+                        olap4j is an open Java
                         <span style="font-variant: small-caps">API</span> for
                         <span style="font-variant: small-caps">OLAP</span>.</p>
-                        
+
                         <p class="box_header">
-                        Think of it like 
-                        <span style="font-variant: small-caps">JDBC</span>, 
+                        Think of it like
+                        <span style="font-variant: small-caps">JDBC</span>,
                         but for accessing multi-dimensional data.</p>
                         <br />
                         <p class="box_subheader">
                         olap4j is a common API for any OLAP server,
-                        so you can write an 
-                        analytic application on one server and easily switch it to 
-                        another. Built on that API, there is a growing 
+                        so you can write an
+                        analytic application on one server and easily switch it to
+                        another. Built on that API, there is a growing
                         collection of tools and components.</p></div></td>
           <td class="home_box"><img src="images/spacer.png" class="home_box_spacer"/></td>
         </tr>
@@ -169,8 +179,8 @@
   </tr>
   <tr>
     <td colspan="2" valign="top"><table width="700" border="0" cellspacing="0" cellpadding="0">
-        
-        
+
+
         <tr>
           <td width="100%" valign="top" style="padding-bottom: 10px;">
           <h4>Status</h4>
@@ -178,7 +188,7 @@ <h4>Status</h4>
           <p>This olap4j release includes the specification, a technology compatibility kit (TCK)
           and a generic XML/A driver compatible with Pentaho Analysis (Mondrian), Microsoft SQL Server Analysis Services, Palo and SAP BW.</p><br/>
           <p><a href="http://www.pentaho.com/news/releases/pentaho-announces-a-new-era-in-open-standards-for-analytics/">Read the press release</a>.</p>
-          
+
           <h4>Resources</h4>
             <ul>
               <li><a href="http://sourceforge.net/projects/olap4j">olap4j project at SourceForge</a>.</li>
@@ -248,7 +258,7 @@ <h5>Experimental packages</h5>
             </ul>
           </p>
 
-            <h4>Get involved!</h4> 
+            <h4>Get involved!</h4>
 
             <p>Join the
             <a href="http://sourceforge.net/forum/forum.php?forum_id=577988">forum</a>,
diff --git a/foodmart/FoodMart.xml b/foodmart/FoodMart.xml
index d4bbe44..1cc36cd 100644
--- a/foodmart/FoodMart.xml
+++ b/foodmart/FoodMart.xml
@@ -2,13 +2,22 @@
 <Schema name="FoodMart">
 <!--
   == $Id:$
-  == This software is subject to the terms of the Eclipse Public License v1.0
-  == Agreement, available at the following URL:
-  == http://www.eclipse.org/legal/epl-v10.html.
-  == Copyright (C) 2000-2002 Kana Software, Inc.
-  == Copyright (C) 2002-2011 Julian Hyde and others.
-  == All Rights Reserved.
-  == You must accept the terms of that agreement to use this software.
+  ==
+  == Licensed to Julian Hyde under one or more contributor license
+  == agreements. See the NOTICE file distributed with this work for
+  == additional information regarding copyright ownership.
+  ==
+  == Julian Hyde 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.
   -->
 
 <!-- Shared dimensions -->
@@ -383,7 +392,7 @@ Iif("sales_fact_1997"."promotion_id" = 0, 0, "sales_fact_1997"."store_sales")
   </CalculatedMember>
   <NamedSet name="Top Sellers">
     <Formula>TopCount([Warehouse].[Warehouse Name].MEMBERS, 5, [Measures].[Warehouse Sales])</Formula>
-  </NamedSet>    
+  </NamedSet>
 </Cube>
 
 <!-- Test a cube based upon a single table. -->
diff --git a/ivy-tck.xml b/ivy-tck.xml
index e90cedd..a82bc6b 100644
--- a/ivy-tck.xml
+++ b/ivy-tck.xml
@@ -2,12 +2,22 @@
 <?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
 <!--
   == $Id:$
-  == This software is subject to the terms of the Eclipse Public License v1.0
-  == Agreement, available at the following URL:
-  == http://www.eclipse.org/legal/epl-v10.html.
-  == Copyright (C) 2009-2011 Julian Hyde
-  == All Rights Reserved.
-  == You must accept the terms of that agreement to use this software.
+  ==
+  == Licensed to Julian Hyde under one or more contributor license
+  == agreements. See the NOTICE file distributed with this work for
+  == additional information regarding copyright ownership.
+  ==
+  == Julian Hyde 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.
   -->
 <ivy-module
     version="2.0"
@@ -15,7 +25,7 @@
     xmlns:m="http://ant.apache.org/ivy/maven"
     xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
   <info organisation="${ivy.artifact.group}" module="${ivy.artifact.id}-tck" revision="${project.revision}">
-      <license name="EPL" url="http://www.eclipse.org/legal/epl-v10.html"/>
+      <license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
       <ivyauthor name="Julian Hyde" />
       <repository name="pentaho-repository" url="http://repo.pentaho.org/artifactory"/>
       <description homepage="http://olap4j.org">
diff --git a/ivy-xmla.xml b/ivy-xmla.xml
index 08416bd..3a61b98 100644
--- a/ivy-xmla.xml
+++ b/ivy-xmla.xml
@@ -2,12 +2,22 @@
 <?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
 <!--
   == $Id:$
-  == This software is subject to the terms of the Eclipse Public License v1.0
-  == Agreement, available at the following URL:
-  == http://www.eclipse.org/legal/epl-v10.html.
-  == Copyright (C) 2009-2011 Julian Hyde
-  == All Rights Reserved.
-  == You must accept the terms of that agreement to use this software.
+  ==
+  == Licensed to Julian Hyde under one or more contributor license
+  == agreements. See the NOTICE file distributed with this work for
+  == additional information regarding copyright ownership.
+  ==
+  == Julian Hyde 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.
   -->
 <ivy-module
     version="2.0"
@@ -15,7 +25,7 @@
     xmlns:m="http://ant.apache.org/ivy/maven"
     xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
   <info organisation="${ivy.artifact.group}" module="${ivy.artifact.id}-xmla" revision="${project.revision}">
-      <license name="EPL" url="http://www.eclipse.org/legal/epl-v10.html"/>
+      <license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
       <ivyauthor name="Julian Hyde" />
       <repository name="pentaho-repository" url="http://repo.pentaho.org/artifactory"/>
       <description homepage="http://olap4j.org">
diff --git a/ivy.xml b/ivy.xml
index a62ae27..4fb76a8 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -2,12 +2,22 @@
 <?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
 <!--
   == $Id:$
-  == This software is subject to the terms of the Eclipse Public License v1.0
-  == Agreement, available at the following URL:
-  == http://www.eclipse.org/legal/epl-v10.html.
-  == Copyright (C) 2009-2011 Julian Hyde
-  == All Rights Reserved.
-  == You must accept the terms of that agreement to use this software.
+  ==
+  == Licensed to Julian Hyde under one or more contributor license
+  == agreements. See the NOTICE file distributed with this work for
+  == additional information regarding copyright ownership.
+  ==
+  == Julian Hyde 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.
   -->
 <ivy-module
     version="2.0"
@@ -15,7 +25,7 @@
     xmlns:m="http://ant.apache.org/ivy/maven"
     xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
   <info organisation="${ivy.artifact.group}" module="${ivy.artifact.id}" revision="${project.revision}">
-      <license name="EPL" url="http://www.eclipse.org/legal/epl-v10.html"/>
+      <license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
       <ivyauthor name="Julian Hyde" />
       <repository name="pentaho-repository" url="http://repo.pentaho.org/artifactory"/>
       <description homepage="http://olap4j.org">
diff --git a/src/org/olap4j/AllocationPolicy.java b/src/org/olap4j/AllocationPolicy.java
index 145d0d4..c45550f 100644
--- a/src/org/olap4j/AllocationPolicy.java
+++ b/src/org/olap4j/AllocationPolicy.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2009-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/Axis.java b/src/org/olap4j/Axis.java
index 9561085..65c119e 100644
--- a/src/org/olap4j/Axis.java
+++ b/src/org/olap4j/Axis.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/Cell.java b/src/org/olap4j/Cell.java
index 24b7b41..4d255b7 100755
--- a/src/org/olap4j/Cell.java
+++ b/src/org/olap4j/Cell.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/CellSet.java b/src/org/olap4j/CellSet.java
index c11fc6e..70060ab 100755
--- a/src/org/olap4j/CellSet.java
+++ b/src/org/olap4j/CellSet.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/CellSetAxis.java b/src/org/olap4j/CellSetAxis.java
index a6660bf..32c6cbf 100755
--- a/src/org/olap4j/CellSetAxis.java
+++ b/src/org/olap4j/CellSetAxis.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/CellSetAxisMetaData.java b/src/org/olap4j/CellSetAxisMetaData.java
index 6b99beb..9771ab1 100755
--- a/src/org/olap4j/CellSetAxisMetaData.java
+++ b/src/org/olap4j/CellSetAxisMetaData.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/CellSetListener.java b/src/org/olap4j/CellSetListener.java
index 4e7600c..3a1e402 100644
--- a/src/org/olap4j/CellSetListener.java
+++ b/src/org/olap4j/CellSetListener.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2010-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/CellSetMetaData.java b/src/org/olap4j/CellSetMetaData.java
index b51d81c..3da233c 100755
--- a/src/org/olap4j/CellSetMetaData.java
+++ b/src/org/olap4j/CellSetMetaData.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/OlapConnection.java b/src/org/olap4j/OlapConnection.java
index 6db96a2..7d12f08 100644
--- a/src/org/olap4j/OlapConnection.java
+++ b/src/org/olap4j/OlapConnection.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/OlapDataSource.java b/src/org/olap4j/OlapDataSource.java
index 6813896..f17efbf 100644
--- a/src/org/olap4j/OlapDataSource.java
+++ b/src/org/olap4j/OlapDataSource.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/OlapDatabaseMetaData.java b/src/org/olap4j/OlapDatabaseMetaData.java
index 6f94361..1e0921f 100644
--- a/src/org/olap4j/OlapDatabaseMetaData.java
+++ b/src/org/olap4j/OlapDatabaseMetaData.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/OlapException.java b/src/org/olap4j/OlapException.java
index ff7fa42..0598f0a 100644
--- a/src/org/olap4j/OlapException.java
+++ b/src/org/olap4j/OlapException.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/OlapParameterMetaData.java b/src/org/olap4j/OlapParameterMetaData.java
index f7c3c7b..d5fc573 100755
--- a/src/org/olap4j/OlapParameterMetaData.java
+++ b/src/org/olap4j/OlapParameterMetaData.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2008 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/OlapStatement.java b/src/org/olap4j/OlapStatement.java
index bc483d7..059c982 100644
--- a/src/org/olap4j/OlapStatement.java
+++ b/src/org/olap4j/OlapStatement.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/OlapWrapper.java b/src/org/olap4j/OlapWrapper.java
index 3846b47..8a5f9ba 100644
--- a/src/org/olap4j/OlapWrapper.java
+++ b/src/org/olap4j/OlapWrapper.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/Position.java b/src/org/olap4j/Position.java
index 6e1799c..46cdbe4 100755
--- a/src/org/olap4j/Position.java
+++ b/src/org/olap4j/Position.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/PreparedOlapStatement.java b/src/org/olap4j/PreparedOlapStatement.java
index 77986c1..273e10a 100644
--- a/src/org/olap4j/PreparedOlapStatement.java
+++ b/src/org/olap4j/PreparedOlapStatement.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/Scenario.java b/src/org/olap4j/Scenario.java
index c80c2f9..cc6cb25 100644
--- a/src/org/olap4j/Scenario.java
+++ b/src/org/olap4j/Scenario.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2009-2010 Julian Hyde and others
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/src/org/olap4j/driver/xmla/DeferredNamedListImpl.java b/src/org/olap4j/driver/xmla/DeferredNamedListImpl.java
index aa8e357..1ee11ec 100644
--- a/src/org/olap4j/driver/xmla/DeferredNamedListImpl.java
+++ b/src/org/olap4j/driver/xmla/DeferredNamedListImpl.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/EmptyResultSet.java b/src/org/olap4j/driver/xmla/EmptyResultSet.java
index a746079..49095a4 100644
--- a/src/org/olap4j/driver/xmla/EmptyResultSet.java
+++ b/src/org/olap4j/driver/xmla/EmptyResultSet.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/Factory.java b/src/org/olap4j/driver/xmla/Factory.java
index 44bd7b4..41b208e 100644
--- a/src/org/olap4j/driver/xmla/Factory.java
+++ b/src/org/olap4j/driver/xmla/Factory.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/FactoryJdbc3Impl.java b/src/org/olap4j/driver/xmla/FactoryJdbc3Impl.java
index 8a333d4..8ad54c7 100644
--- a/src/org/olap4j/driver/xmla/FactoryJdbc3Impl.java
+++ b/src/org/olap4j/driver/xmla/FactoryJdbc3Impl.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/FactoryJdbc41Impl.java b/src/org/olap4j/driver/xmla/FactoryJdbc41Impl.java
index 489778b..42c670b 100644
--- a/src/org/olap4j/driver/xmla/FactoryJdbc41Impl.java
+++ b/src/org/olap4j/driver/xmla/FactoryJdbc41Impl.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2011-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id: $
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/FactoryJdbc4Impl.java b/src/org/olap4j/driver/xmla/FactoryJdbc4Impl.java
index 4f3ed72..56fa072 100644
--- a/src/org/olap4j/driver/xmla/FactoryJdbc4Impl.java
+++ b/src/org/olap4j/driver/xmla/FactoryJdbc4Impl.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/FactoryJdbc4Plus.java b/src/org/olap4j/driver/xmla/FactoryJdbc4Plus.java
index 5200fd9..d760dcf 100644
--- a/src/org/olap4j/driver/xmla/FactoryJdbc4Plus.java
+++ b/src/org/olap4j/driver/xmla/FactoryJdbc4Plus.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id: $
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/MetadataReader.java b/src/org/olap4j/driver/xmla/MetadataReader.java
index 72977a6..7c86ee2 100644
--- a/src/org/olap4j/driver/xmla/MetadataReader.java
+++ b/src/org/olap4j/driver/xmla/MetadataReader.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaHelper.java b/src/org/olap4j/driver/xmla/XmlaHelper.java
index 50dbac1..bd6f846 100644
--- a/src/org/olap4j/driver/xmla/XmlaHelper.java
+++ b/src/org/olap4j/driver/xmla/XmlaHelper.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCatalog.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCatalog.java
index 8e80a5d..48f5515 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCatalog.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCatalog.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCell.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCell.java
index 7f3cd65..f111f23 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCell.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCell.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellProperty.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellProperty.java
index 07a2814..9d3fc2e 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCellProperty.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCellProperty.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java
index 99ba57c..b0ae0ce 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetAxis.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetAxis.java
index 1d03656..14aef4b 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetAxis.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetAxis.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetAxisMetaData.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetAxisMetaData.java
index b724fc0..e786ad6 100755
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetAxisMetaData.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetAxisMetaData.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMemberProperty.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMemberProperty.java
index 85d4098..9bd895c 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMemberProperty.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMemberProperty.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java
index 46fc968..44c2d9b 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
index 2f541d1..2d3f443 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCube.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCube.java
index fbc82c1..2915b9c 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCube.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCube.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jDatabase.java b/src/org/olap4j/driver/xmla/XmlaOlap4jDatabase.java
index 524c0bf..09f17dd 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jDatabase.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jDatabase.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2011 Julian Hyde and others.
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id: $
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jDatabaseMetaData.java b/src/org/olap4j/driver/xmla/XmlaOlap4jDatabaseMetaData.java
index 2b6d05f..d90136e 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jDatabaseMetaData.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jDatabaseMetaData.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jDimension.java b/src/org/olap4j/driver/xmla/XmlaOlap4jDimension.java
index 36c77d4..d4ec023 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jDimension.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jDimension.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java b/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java
index f168cc5..da6c560 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jElement.java b/src/org/olap4j/driver/xmla/XmlaOlap4jElement.java
index f294452..833878d 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jElement.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jElement.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
@@ -72,7 +83,7 @@ public int hashCode() {
 
     // Keep this declaration abstract as a reminder to
     // overriding classes.
-    abstract public boolean equals(Object obj);
+    public abstract boolean equals(Object obj);
 }
 
 // End XmlaOlap4jElement.java
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jHierarchy.java b/src/org/olap4j/driver/xmla/XmlaOlap4jHierarchy.java
index d1f77c3..2a24a5a 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jHierarchy.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jHierarchy.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java b/src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java
index 9ec1b28..6009c7c 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jMeasure.java b/src/org/olap4j/driver/xmla/XmlaOlap4jMeasure.java
index bcc5046..b278d58 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jMeasure.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jMeasure.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jMember.java b/src/org/olap4j/driver/xmla/XmlaOlap4jMember.java
index 34ed68b..9b92336 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jMember.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jMember.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jMemberBase.java b/src/org/olap4j/driver/xmla/XmlaOlap4jMemberBase.java
index c378042..16d1aeb 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jMemberBase.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jMemberBase.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jNamedSet.java b/src/org/olap4j/driver/xmla/XmlaOlap4jNamedSet.java
index 51e21a5..f3b5ef4 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jNamedSet.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jNamedSet.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jPosition.java b/src/org/olap4j/driver/xmla/XmlaOlap4jPosition.java
index f84b7a0..92563e5 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jPosition.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jPosition.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jPositionMember.java b/src/org/olap4j/driver/xmla/XmlaOlap4jPositionMember.java
index b257281..bcb9b2a 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jPositionMember.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jPositionMember.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jPreparedStatement.java b/src/org/olap4j/driver/xmla/XmlaOlap4jPreparedStatement.java
index f472dcf..60d2727 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jPreparedStatement.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jPreparedStatement.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jProperty.java b/src/org/olap4j/driver/xmla/XmlaOlap4jProperty.java
index 3df59c1..f1a33ea 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jProperty.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jProperty.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jSchema.java b/src/org/olap4j/driver/xmla/XmlaOlap4jSchema.java
index 9eff658..5cd523f 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jSchema.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jSchema.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jServerInfos.java b/src/org/olap4j/driver/xmla/XmlaOlap4jServerInfos.java
index b7237c9..288261a 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jServerInfos.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jServerInfos.java
@@ -1,11 +1,21 @@
 /*
 // $Id:$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2011 Julian Hyde and others.
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
@@ -42,4 +52,4 @@ public interface XmlaOlap4jServerInfos {
      */
     void setSessionId(String sessionId);
 }
-// End XmlaOlap4jServerInfos.java
\ No newline at end of file
+// End XmlaOlap4jServerInfos.java
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jStatement.java b/src/org/olap4j/driver/xmla/XmlaOlap4jStatement.java
index 9fedb85..752d0e9 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jStatement.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jStatement.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jUtil.java b/src/org/olap4j/driver/xmla/XmlaOlap4jUtil.java
index 2ae7cef..504b638 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jUtil.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jUtil.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla;
 
diff --git a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jCache.java b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jCache.java
index 25fdc53..94520b1 100644
--- a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jCache.java
+++ b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jCache.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.cache;
 
diff --git a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jCacheElement.java b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jCacheElement.java
index e428a56..d364404 100644
--- a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jCacheElement.java
+++ b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jCacheElement.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.cache;
 
diff --git a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jConcurrentMemoryCache.java b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jConcurrentMemoryCache.java
index 1713aab..fdd3b83 100644
--- a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jConcurrentMemoryCache.java
+++ b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jConcurrentMemoryCache.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.cache;
 
@@ -33,17 +43,17 @@ class XmlaOlap4jConcurrentMemoryCache {
     /**
      * Default cache timeout (1 minute). The value is in seconds.
      */
-    private final static int DEFAULT_CACHE_TIMEOUT = 60;
+    private static final int DEFAULT_CACHE_TIMEOUT = 60;
 
     /**
      * Default cache size (10).
      */
-    private final static int DEFAULT_CACHE_SIZE = 10;
+    private static final int DEFAULT_CACHE_SIZE = 10;
 
     /**
      * Default eviction mode (LFU).
      */
-    private final static Mode DEFAULT_EVICTION_MODE = Mode.LFU;
+    private static final Mode DEFAULT_EVICTION_MODE = Mode.LFU;
 
 
     /**
diff --git a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jInvalidStateException.java b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jInvalidStateException.java
index 80d7d61..8a9aef9 100644
--- a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jInvalidStateException.java
+++ b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jInvalidStateException.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.cache;
 
diff --git a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jNamedMemoryCache.java b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jNamedMemoryCache.java
index af8108e..106a168 100644
--- a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jNamedMemoryCache.java
+++ b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jNamedMemoryCache.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.cache;
 
diff --git a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jShaEncoder.java b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jShaEncoder.java
index 2201ee9..81d84f9 100644
--- a/src/org/olap4j/driver/xmla/cache/XmlaOlap4jShaEncoder.java
+++ b/src/org/olap4j/driver/xmla/cache/XmlaOlap4jShaEncoder.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.cache;
 
diff --git a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jAbstractHttpProxy.java b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jAbstractHttpProxy.java
index a0ad78b..808e2ca 100644
--- a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jAbstractHttpProxy.java
+++ b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jAbstractHttpProxy.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.proxy;
 
@@ -67,7 +77,7 @@ protected XmlaOlap4jAbstractHttpProxy() {
      * @param request Request string
      * @return Response
      */
-    abstract public byte[] getResponse(
+    public abstract byte[] getResponse(
         XmlaOlap4jServerInfos serverInfos,
         String request)
             throws XmlaOlap4jProxyException;
@@ -80,7 +90,7 @@ abstract public byte[] getResponse(
      * @param request Request
      * @return Future object representing the submitted job
      */
-    abstract public Future<byte[]> getResponseViaSubmit(
+    public abstract Future<byte[]> getResponseViaSubmit(
         XmlaOlap4jServerInfos serverInfos,
         String request);
 
diff --git a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCachedProxy.java b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCachedProxy.java
index 3a1c33f..10ba15c 100644
--- a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCachedProxy.java
+++ b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCachedProxy.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.proxy;
 
diff --git a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCookieManager.java b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCookieManager.java
index 86b5e13..c33f35f 100644
--- a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCookieManager.java
+++ b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCookieManager.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.proxy;
 
diff --git a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jHttpProxy.java b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jHttpProxy.java
index 2ae641a..c9e879b 100644
--- a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jHttpProxy.java
+++ b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jHttpProxy.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.proxy;
 
diff --git a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jProxy.java b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jProxy.java
index e7d38fc..69713f2 100644
--- a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jProxy.java
+++ b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jProxy.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.proxy;
 
diff --git a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jProxyException.java b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jProxyException.java
index 2f837c6..4b89a2e 100644
--- a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jProxyException.java
+++ b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jProxyException.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.proxy;
 
@@ -23,4 +33,4 @@ public XmlaOlap4jProxyException(String message, Throwable cause) {
     }
 }
 
-// End XmlaOlap4jProxyException.java
\ No newline at end of file
+// End XmlaOlap4jProxyException.java
diff --git a/src/org/olap4j/impl/AbstractNamedList.java b/src/org/olap4j/impl/AbstractNamedList.java
index 1520898..02a1232 100644
--- a/src/org/olap4j/impl/AbstractNamedList.java
+++ b/src/org/olap4j/impl/AbstractNamedList.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/ArrayMap.java b/src/org/olap4j/impl/ArrayMap.java
index ace6a17..5e23a1e 100644
--- a/src/org/olap4j/impl/ArrayMap.java
+++ b/src/org/olap4j/impl/ArrayMap.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/ArrayNamedListImpl.java b/src/org/olap4j/impl/ArrayNamedListImpl.java
index fda4570..31f2740 100644
--- a/src/org/olap4j/impl/ArrayNamedListImpl.java
+++ b/src/org/olap4j/impl/ArrayNamedListImpl.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/Base64.java b/src/org/olap4j/impl/Base64.java
index 1ed7371..9198c5c 100644
--- a/src/org/olap4j/impl/Base64.java
+++ b/src/org/olap4j/impl/Base64.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2010 Julian Hyde and others
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/Bug.java b/src/org/olap4j/impl/Bug.java
index ffbb292..468edb3 100644
--- a/src/org/olap4j/impl/Bug.java
+++ b/src/org/olap4j/impl/Bug.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2010-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/ConnectStringParser.java b/src/org/olap4j/impl/ConnectStringParser.java
index ab1baef..ad3e8d7 100644
--- a/src/org/olap4j/impl/ConnectStringParser.java
+++ b/src/org/olap4j/impl/ConnectStringParser.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/CoordinateIterator.java b/src/org/olap4j/impl/CoordinateIterator.java
index e75fafe..680085b 100644
--- a/src/org/olap4j/impl/CoordinateIterator.java
+++ b/src/org/olap4j/impl/CoordinateIterator.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2009-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/IdentifierParser.java b/src/org/olap4j/impl/IdentifierParser.java
index 69a23d7..68b61b9 100644
--- a/src/org/olap4j/impl/IdentifierParser.java
+++ b/src/org/olap4j/impl/IdentifierParser.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2010-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/LcidLocale.java b/src/org/olap4j/impl/LcidLocale.java
index 41afdc6..62befd3 100644
--- a/src/org/olap4j/impl/LcidLocale.java
+++ b/src/org/olap4j/impl/LcidLocale.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2011-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id: $
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/Named.java b/src/org/olap4j/impl/Named.java
index fbef1c8..1e17b23 100644
--- a/src/org/olap4j/impl/Named.java
+++ b/src/org/olap4j/impl/Named.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/NamedListImpl.java b/src/org/olap4j/impl/NamedListImpl.java
index b1759a2..495b6a0 100644
--- a/src/org/olap4j/impl/NamedListImpl.java
+++ b/src/org/olap4j/impl/NamedListImpl.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/Olap4jUtil.java b/src/org/olap4j/impl/Olap4jUtil.java
index e28c364..b4a9d8f 100644
--- a/src/org/olap4j/impl/Olap4jUtil.java
+++ b/src/org/olap4j/impl/Olap4jUtil.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/Olap4jUtilCompatible.java b/src/org/olap4j/impl/Olap4jUtilCompatible.java
index 628d7b6..71d14ce 100644
--- a/src/org/olap4j/impl/Olap4jUtilCompatible.java
+++ b/src/org/olap4j/impl/Olap4jUtilCompatible.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/Olap4jUtilCompatibleJdk14.java b/src/org/olap4j/impl/Olap4jUtilCompatibleJdk14.java
index 2ee912e..ec82a2d 100644
--- a/src/org/olap4j/impl/Olap4jUtilCompatibleJdk14.java
+++ b/src/org/olap4j/impl/Olap4jUtilCompatibleJdk14.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/Olap4jUtilCompatibleJdk15.java b/src/org/olap4j/impl/Olap4jUtilCompatibleJdk15.java
index 5e67b2c..5a43160 100644
--- a/src/org/olap4j/impl/Olap4jUtilCompatibleJdk15.java
+++ b/src/org/olap4j/impl/Olap4jUtilCompatibleJdk15.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/Pair.java b/src/org/olap4j/impl/Pair.java
index 986f956..b79ef1f 100644
--- a/src/org/olap4j/impl/Pair.java
+++ b/src/org/olap4j/impl/Pair.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/UnmodifiableArrayList.java b/src/org/olap4j/impl/UnmodifiableArrayList.java
index eb8ca5e..e2a41f0 100644
--- a/src/org/olap4j/impl/UnmodifiableArrayList.java
+++ b/src/org/olap4j/impl/UnmodifiableArrayList.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2009-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/impl/UnmodifiableArrayMap.java b/src/org/olap4j/impl/UnmodifiableArrayMap.java
index f85e271..69a1b7b 100644
--- a/src/org/olap4j/impl/UnmodifiableArrayMap.java
+++ b/src/org/olap4j/impl/UnmodifiableArrayMap.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2010-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/src/org/olap4j/layout/CellSetFormatter.java b/src/org/olap4j/layout/CellSetFormatter.java
index 3681901..d088d25 100644
--- a/src/org/olap4j/layout/CellSetFormatter.java
+++ b/src/org/olap4j/layout/CellSetFormatter.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2009-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.layout;
 
diff --git a/src/org/olap4j/layout/RectangularCellSetFormatter.java b/src/org/olap4j/layout/RectangularCellSetFormatter.java
index 252cf8e..9628f86 100644
--- a/src/org/olap4j/layout/RectangularCellSetFormatter.java
+++ b/src/org/olap4j/layout/RectangularCellSetFormatter.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2009-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.layout;
 
diff --git a/src/org/olap4j/layout/TraditionalCellSetFormatter.java b/src/org/olap4j/layout/TraditionalCellSetFormatter.java
index e6d06fa..456c59a 100644
--- a/src/org/olap4j/layout/TraditionalCellSetFormatter.java
+++ b/src/org/olap4j/layout/TraditionalCellSetFormatter.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2009-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.layout;
 
diff --git a/src/org/olap4j/mdx/AxisNode.java b/src/org/olap4j/mdx/AxisNode.java
index 8f0a262..62ade87 100644
--- a/src/org/olap4j/mdx/AxisNode.java
+++ b/src/org/olap4j/mdx/AxisNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/CallNode.java b/src/org/olap4j/mdx/CallNode.java
index f0f6e2a..03fd66e 100644
--- a/src/org/olap4j/mdx/CallNode.java
+++ b/src/org/olap4j/mdx/CallNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/CubeNode.java b/src/org/olap4j/mdx/CubeNode.java
index 62d3283..f399414 100644
--- a/src/org/olap4j/mdx/CubeNode.java
+++ b/src/org/olap4j/mdx/CubeNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/DefaultMdxValidatorImpl.java b/src/org/olap4j/mdx/DefaultMdxValidatorImpl.java
index 1d6cb4b..9ec125a 100644
--- a/src/org/olap4j/mdx/DefaultMdxValidatorImpl.java
+++ b/src/org/olap4j/mdx/DefaultMdxValidatorImpl.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/DimensionNode.java b/src/org/olap4j/mdx/DimensionNode.java
index 1ef62df..fd4806e 100644
--- a/src/org/olap4j/mdx/DimensionNode.java
+++ b/src/org/olap4j/mdx/DimensionNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/HierarchyNode.java b/src/org/olap4j/mdx/HierarchyNode.java
index f0fbea1..238ccba 100644
--- a/src/org/olap4j/mdx/HierarchyNode.java
+++ b/src/org/olap4j/mdx/HierarchyNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/IdentifierNode.java b/src/org/olap4j/mdx/IdentifierNode.java
index 22d9c38..57996db 100644
--- a/src/org/olap4j/mdx/IdentifierNode.java
+++ b/src/org/olap4j/mdx/IdentifierNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/IdentifierSegment.java b/src/org/olap4j/mdx/IdentifierSegment.java
index 7c00372..11300ee 100644
--- a/src/org/olap4j/mdx/IdentifierSegment.java
+++ b/src/org/olap4j/mdx/IdentifierSegment.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/KeySegment.java b/src/org/olap4j/mdx/KeySegment.java
index fb12871..b8c55a7 100644
--- a/src/org/olap4j/mdx/KeySegment.java
+++ b/src/org/olap4j/mdx/KeySegment.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/LevelNode.java b/src/org/olap4j/mdx/LevelNode.java
index f9b129b..ca202d3 100644
--- a/src/org/olap4j/mdx/LevelNode.java
+++ b/src/org/olap4j/mdx/LevelNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/LiteralNode.java b/src/org/olap4j/mdx/LiteralNode.java
index 8afd254..a70d5bb 100644
--- a/src/org/olap4j/mdx/LiteralNode.java
+++ b/src/org/olap4j/mdx/LiteralNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/MdxUtil.java b/src/org/olap4j/mdx/MdxUtil.java
index 9dc2f97..b467686 100644
--- a/src/org/olap4j/mdx/MdxUtil.java
+++ b/src/org/olap4j/mdx/MdxUtil.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/MemberNode.java b/src/org/olap4j/mdx/MemberNode.java
index 6260685..17fe3a9 100644
--- a/src/org/olap4j/mdx/MemberNode.java
+++ b/src/org/olap4j/mdx/MemberNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/NameSegment.java b/src/org/olap4j/mdx/NameSegment.java
index d2ff3b1..f9dc7f1 100644
--- a/src/org/olap4j/mdx/NameSegment.java
+++ b/src/org/olap4j/mdx/NameSegment.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/ParameterNode.java b/src/org/olap4j/mdx/ParameterNode.java
index f76bd82..05f2f87 100644
--- a/src/org/olap4j/mdx/ParameterNode.java
+++ b/src/org/olap4j/mdx/ParameterNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/ParseRegion.java b/src/org/olap4j/mdx/ParseRegion.java
index 55dc0ff..b643e17 100644
--- a/src/org/olap4j/mdx/ParseRegion.java
+++ b/src/org/olap4j/mdx/ParseRegion.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/ParseTreeNode.java b/src/org/olap4j/mdx/ParseTreeNode.java
index f7ed5b0..b95c27e 100644
--- a/src/org/olap4j/mdx/ParseTreeNode.java
+++ b/src/org/olap4j/mdx/ParseTreeNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/ParseTreeVisitor.java b/src/org/olap4j/mdx/ParseTreeVisitor.java
index 2916151..8428412 100644
--- a/src/org/olap4j/mdx/ParseTreeVisitor.java
+++ b/src/org/olap4j/mdx/ParseTreeVisitor.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/ParseTreeWriter.java b/src/org/olap4j/mdx/ParseTreeWriter.java
index 84ed6d5..7a9ad32 100644
--- a/src/org/olap4j/mdx/ParseTreeWriter.java
+++ b/src/org/olap4j/mdx/ParseTreeWriter.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/PropertyValueNode.java b/src/org/olap4j/mdx/PropertyValueNode.java
index e624f59..f945203 100644
--- a/src/org/olap4j/mdx/PropertyValueNode.java
+++ b/src/org/olap4j/mdx/PropertyValueNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/Quoting.java b/src/org/olap4j/mdx/Quoting.java
index 5ecce7d..b1a51bf 100644
--- a/src/org/olap4j/mdx/Quoting.java
+++ b/src/org/olap4j/mdx/Quoting.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/SelectNode.java b/src/org/olap4j/mdx/SelectNode.java
index 5829595..0415e61 100644
--- a/src/org/olap4j/mdx/SelectNode.java
+++ b/src/org/olap4j/mdx/SelectNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/Syntax.java b/src/org/olap4j/mdx/Syntax.java
index 800c51a..2998e52 100644
--- a/src/org/olap4j/mdx/Syntax.java
+++ b/src/org/olap4j/mdx/Syntax.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/WithMemberNode.java b/src/org/olap4j/mdx/WithMemberNode.java
index ba1fd94..622bd76 100644
--- a/src/org/olap4j/mdx/WithMemberNode.java
+++ b/src/org/olap4j/mdx/WithMemberNode.java
@@ -1,12 +1,22 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
- */
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
+*/
 package org.olap4j.mdx;
 
 import org.olap4j.type.Type;
diff --git a/src/org/olap4j/mdx/WithSetNode.java b/src/org/olap4j/mdx/WithSetNode.java
index 88c2179..3bf9323 100644
--- a/src/org/olap4j/mdx/WithSetNode.java
+++ b/src/org/olap4j/mdx/WithSetNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/src/org/olap4j/mdx/parser/MdxParseException.java b/src/org/olap4j/mdx/parser/MdxParseException.java
index c05cf0b..9fae422 100644
--- a/src/org/olap4j/mdx/parser/MdxParseException.java
+++ b/src/org/olap4j/mdx/parser/MdxParseException.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx.parser;
 
diff --git a/src/org/olap4j/mdx/parser/MdxParser.java b/src/org/olap4j/mdx/parser/MdxParser.java
index d5e7fe5..8b9792a 100644
--- a/src/org/olap4j/mdx/parser/MdxParser.java
+++ b/src/org/olap4j/mdx/parser/MdxParser.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx.parser;
 
diff --git a/src/org/olap4j/mdx/parser/MdxParserFactory.java b/src/org/olap4j/mdx/parser/MdxParserFactory.java
index 1c7f14c..95f4fe1 100644
--- a/src/org/olap4j/mdx/parser/MdxParserFactory.java
+++ b/src/org/olap4j/mdx/parser/MdxParserFactory.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx.parser;
 
diff --git a/src/org/olap4j/mdx/parser/MdxValidator.java b/src/org/olap4j/mdx/parser/MdxValidator.java
index 479aad4..2bbb021 100644
--- a/src/org/olap4j/mdx/parser/MdxValidator.java
+++ b/src/org/olap4j/mdx/parser/MdxValidator.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx.parser;
 
diff --git a/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup b/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup
index acc2a31..345def7 100644
--- a/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup
+++ b/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup
@@ -1,12 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 1999-2002 Kana Software, Inc.
-// Copyright (C) 2002-2010 Julian Hyde and others.
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 
 import java_cup.runtime.*;
diff --git a/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java b/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java
index 693f578..4c90390 100644
--- a/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java
+++ b/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx.parser.impl;
 
diff --git a/src/org/olap4j/mdx/parser/impl/Scanner.java b/src/org/olap4j/mdx/parser/impl/Scanner.java
index 5cb937b..0c65182 100644
--- a/src/org/olap4j/mdx/parser/impl/Scanner.java
+++ b/src/org/olap4j/mdx/parser/impl/Scanner.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx.parser.impl;
 
diff --git a/src/org/olap4j/mdx/parser/impl/StringScanner.java b/src/org/olap4j/mdx/parser/impl/StringScanner.java
index d13b0ae..2ab5530 100644
--- a/src/org/olap4j/mdx/parser/impl/StringScanner.java
+++ b/src/org/olap4j/mdx/parser/impl/StringScanner.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx.parser.impl;
 
diff --git a/src/org/olap4j/metadata/Catalog.java b/src/org/olap4j/metadata/Catalog.java
index 0e9de14..eb9327b 100644
--- a/src/org/olap4j/metadata/Catalog.java
+++ b/src/org/olap4j/metadata/Catalog.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/Cube.java b/src/org/olap4j/metadata/Cube.java
index c9072a8..66cb30b 100644
--- a/src/org/olap4j/metadata/Cube.java
+++ b/src/org/olap4j/metadata/Cube.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/Database.java b/src/org/olap4j/metadata/Database.java
index e51c036..8001ddd 100644
--- a/src/org/olap4j/metadata/Database.java
+++ b/src/org/olap4j/metadata/Database.java
@@ -1,11 +1,21 @@
 /*
 // $Id:$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/Datatype.java b/src/org/olap4j/metadata/Datatype.java
index 615a519..3b611dd 100644
--- a/src/org/olap4j/metadata/Datatype.java
+++ b/src/org/olap4j/metadata/Datatype.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/DictionaryImpl.java b/src/org/olap4j/metadata/DictionaryImpl.java
index 57720a3..d75b101 100644
--- a/src/org/olap4j/metadata/DictionaryImpl.java
+++ b/src/org/olap4j/metadata/DictionaryImpl.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2010-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/Dimension.java b/src/org/olap4j/metadata/Dimension.java
index b548024..3bac249 100644
--- a/src/org/olap4j/metadata/Dimension.java
+++ b/src/org/olap4j/metadata/Dimension.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/Hierarchy.java b/src/org/olap4j/metadata/Hierarchy.java
index 0da8ee4..cda6a29 100644
--- a/src/org/olap4j/metadata/Hierarchy.java
+++ b/src/org/olap4j/metadata/Hierarchy.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/Level.java b/src/org/olap4j/metadata/Level.java
index a5b0e85..57d58ec 100644
--- a/src/org/olap4j/metadata/Level.java
+++ b/src/org/olap4j/metadata/Level.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/Measure.java b/src/org/olap4j/metadata/Measure.java
index 5eae0ac..8955f24 100644
--- a/src/org/olap4j/metadata/Measure.java
+++ b/src/org/olap4j/metadata/Measure.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/Member.java b/src/org/olap4j/metadata/Member.java
index a76683f..7db722e 100644
--- a/src/org/olap4j/metadata/Member.java
+++ b/src/org/olap4j/metadata/Member.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/MetadataElement.java b/src/org/olap4j/metadata/MetadataElement.java
index abb9eb6..90c91aa 100644
--- a/src/org/olap4j/metadata/MetadataElement.java
+++ b/src/org/olap4j/metadata/MetadataElement.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/NamedList.java b/src/org/olap4j/metadata/NamedList.java
index b50c704..2845feb 100644
--- a/src/org/olap4j/metadata/NamedList.java
+++ b/src/org/olap4j/metadata/NamedList.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/NamedSet.java b/src/org/olap4j/metadata/NamedSet.java
index 2244420..3e9a502 100644
--- a/src/org/olap4j/metadata/NamedSet.java
+++ b/src/org/olap4j/metadata/NamedSet.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/Property.java b/src/org/olap4j/metadata/Property.java
index 8ed45e2..1236ac0 100644
--- a/src/org/olap4j/metadata/Property.java
+++ b/src/org/olap4j/metadata/Property.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/Schema.java b/src/org/olap4j/metadata/Schema.java
index 05e0f55..acbea32 100644
--- a/src/org/olap4j/metadata/Schema.java
+++ b/src/org/olap4j/metadata/Schema.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/XmlaConstant.java b/src/org/olap4j/metadata/XmlaConstant.java
index f2e1182..6ffc0e0 100644
--- a/src/org/olap4j/metadata/XmlaConstant.java
+++ b/src/org/olap4j/metadata/XmlaConstant.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2010-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/metadata/XmlaConstants.java b/src/org/olap4j/metadata/XmlaConstants.java
index 29b3770..9620d1b 100644
--- a/src/org/olap4j/metadata/XmlaConstants.java
+++ b/src/org/olap4j/metadata/XmlaConstants.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2010-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.metadata;
 
diff --git a/src/org/olap4j/query/AbstractSelection.java b/src/org/olap4j/query/AbstractSelection.java
index e862b06..9a93d38 100644
--- a/src/org/olap4j/query/AbstractSelection.java
+++ b/src/org/olap4j/query/AbstractSelection.java
@@ -1,11 +1,21 @@
 /*
 // $Id:$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.query;
 
diff --git a/src/org/olap4j/query/LevelSelectionImpl.java b/src/org/olap4j/query/LevelSelectionImpl.java
index 40d219a..b01a42f 100644
--- a/src/org/olap4j/query/LevelSelectionImpl.java
+++ b/src/org/olap4j/query/LevelSelectionImpl.java
@@ -1,12 +1,22 @@
 /*
 // $Id: LevelSelectionImpl.java 399 2011-02-03 20:53:50Z pstoellberger $
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
- */
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
+*/
 package org.olap4j.query;
 
 import org.olap4j.OlapException;
diff --git a/src/org/olap4j/query/MemberSelectionImpl.java b/src/org/olap4j/query/MemberSelectionImpl.java
index 9b18ccb..b32a75a 100644
--- a/src/org/olap4j/query/MemberSelectionImpl.java
+++ b/src/org/olap4j/query/MemberSelectionImpl.java
@@ -1,12 +1,22 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
- */
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
+*/
 package org.olap4j.query;
 
 import org.olap4j.mdx.ParseTreeNode;
diff --git a/src/org/olap4j/query/Olap4jNodeConverter.java b/src/org/olap4j/query/Olap4jNodeConverter.java
index e1981d6..bce2486 100644
--- a/src/org/olap4j/query/Olap4jNodeConverter.java
+++ b/src/org/olap4j/query/Olap4jNodeConverter.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.query;
 
diff --git a/src/org/olap4j/query/Query.java b/src/org/olap4j/query/Query.java
index 254b066..4a47be1 100644
--- a/src/org/olap4j/query/Query.java
+++ b/src/org/olap4j/query/Query.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.query;
 
diff --git a/src/org/olap4j/query/QueryAxis.java b/src/org/olap4j/query/QueryAxis.java
index 85ad120..ddd4aba 100644
--- a/src/org/olap4j/query/QueryAxis.java
+++ b/src/org/olap4j/query/QueryAxis.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.query;
 
diff --git a/src/org/olap4j/query/QueryDimension.java b/src/org/olap4j/query/QueryDimension.java
index bcd8d8a..b83d325 100644
--- a/src/org/olap4j/query/QueryDimension.java
+++ b/src/org/olap4j/query/QueryDimension.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.query;
 
diff --git a/src/org/olap4j/query/QueryEvent.java b/src/org/olap4j/query/QueryEvent.java
index cbb0180..9a7e42f 100644
--- a/src/org/olap4j/query/QueryEvent.java
+++ b/src/org/olap4j/query/QueryEvent.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2009-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.query;
 
diff --git a/src/org/olap4j/query/QueryNode.java b/src/org/olap4j/query/QueryNode.java
index 04ad151..6f215ec 100644
--- a/src/org/olap4j/query/QueryNode.java
+++ b/src/org/olap4j/query/QueryNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.query;
 
@@ -34,4 +44,4 @@ interface QueryNode {
      */
     public void removeQueryNodeListener(QueryNodeListener l);
 }
-// End QueryNode.java
\ No newline at end of file
+// End QueryNode.java
diff --git a/src/org/olap4j/query/QueryNodeImpl.java b/src/org/olap4j/query/QueryNodeImpl.java
index f37992d..2f6ca4c 100644
--- a/src/org/olap4j/query/QueryNodeImpl.java
+++ b/src/org/olap4j/query/QueryNodeImpl.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2009-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.query;
 
diff --git a/src/org/olap4j/query/QueryNodeListener.java b/src/org/olap4j/query/QueryNodeListener.java
index 6ad3fa9..b54c01c 100644
--- a/src/org/olap4j/query/QueryNodeListener.java
+++ b/src/org/olap4j/query/QueryNodeListener.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2009-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.query;
 
diff --git a/src/org/olap4j/query/Selection.java b/src/org/olap4j/query/Selection.java
index 96c38a5..dcac543 100644
--- a/src/org/olap4j/query/Selection.java
+++ b/src/org/olap4j/query/Selection.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.query;
 
diff --git a/src/org/olap4j/query/SelectionFactory.java b/src/org/olap4j/query/SelectionFactory.java
index fc0ce91..857ca6b 100644
--- a/src/org/olap4j/query/SelectionFactory.java
+++ b/src/org/olap4j/query/SelectionFactory.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.query;
 
diff --git a/src/org/olap4j/query/SortOrder.java b/src/org/olap4j/query/SortOrder.java
index 500505e..dc36424 100644
--- a/src/org/olap4j/query/SortOrder.java
+++ b/src/org/olap4j/query/SortOrder.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.query;
 /**
diff --git a/src/org/olap4j/sample/PaloConnection.java b/src/org/olap4j/sample/PaloConnection.java
index 5e7c76e..fb9b644 100644
--- a/src/org/olap4j/sample/PaloConnection.java
+++ b/src/org/olap4j/sample/PaloConnection.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.sample;
 
diff --git a/src/org/olap4j/sample/SimpleQuerySample.java b/src/org/olap4j/sample/SimpleQuerySample.java
index 9dea093..96faffb 100644
--- a/src/org/olap4j/sample/SimpleQuerySample.java
+++ b/src/org/olap4j/sample/SimpleQuerySample.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.sample;
 
diff --git a/src/org/olap4j/transform/AxisTransform.java b/src/org/olap4j/transform/AxisTransform.java
index 26365a5..f4ef17e 100644
--- a/src/org/olap4j/transform/AxisTransform.java
+++ b/src/org/olap4j/transform/AxisTransform.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.transform;
 
diff --git a/src/org/olap4j/transform/DrillDownOnPositionTransform.java b/src/org/olap4j/transform/DrillDownOnPositionTransform.java
index 7315f75..5001523 100644
--- a/src/org/olap4j/transform/DrillDownOnPositionTransform.java
+++ b/src/org/olap4j/transform/DrillDownOnPositionTransform.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.transform;
 
diff --git a/src/org/olap4j/transform/DrillReplaceTransform.java b/src/org/olap4j/transform/DrillReplaceTransform.java
index f347f5f..51e8841 100644
--- a/src/org/olap4j/transform/DrillReplaceTransform.java
+++ b/src/org/olap4j/transform/DrillReplaceTransform.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.transform;
 
diff --git a/src/org/olap4j/transform/MdxHelper.java b/src/org/olap4j/transform/MdxHelper.java
index 9da108e..622847f 100644
--- a/src/org/olap4j/transform/MdxHelper.java
+++ b/src/org/olap4j/transform/MdxHelper.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.transform;
 
diff --git a/src/org/olap4j/transform/MdxQueryTransform.java b/src/org/olap4j/transform/MdxQueryTransform.java
index 3a86159..3094a00 100644
--- a/src/org/olap4j/transform/MdxQueryTransform.java
+++ b/src/org/olap4j/transform/MdxQueryTransform.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.transform;
 
diff --git a/src/org/olap4j/transform/Quax.java b/src/org/olap4j/transform/Quax.java
index 1537f89..4042c4e 100644
--- a/src/org/olap4j/transform/Quax.java
+++ b/src/org/olap4j/transform/Quax.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.transform;
 
diff --git a/src/org/olap4j/transform/RollUpLevelTransform.java b/src/org/olap4j/transform/RollUpLevelTransform.java
index c685dd5..a207952 100644
--- a/src/org/olap4j/transform/RollUpLevelTransform.java
+++ b/src/org/olap4j/transform/RollUpLevelTransform.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.transform;
 
diff --git a/src/org/olap4j/transform/StandardTransformLibrary.java b/src/org/olap4j/transform/StandardTransformLibrary.java
index 0c8f7f1..705b53c 100644
--- a/src/org/olap4j/transform/StandardTransformLibrary.java
+++ b/src/org/olap4j/transform/StandardTransformLibrary.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.transform;
 
diff --git a/src/org/olap4j/transform/TransformUtil.java b/src/org/olap4j/transform/TransformUtil.java
index 7e576ee..2bd9f58 100644
--- a/src/org/olap4j/transform/TransformUtil.java
+++ b/src/org/olap4j/transform/TransformUtil.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.transform;
 
diff --git a/src/org/olap4j/transform/TreeNode.java b/src/org/olap4j/transform/TreeNode.java
index ca64053..2865a2f 100644
--- a/src/org/olap4j/transform/TreeNode.java
+++ b/src/org/olap4j/transform/TreeNode.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.transform;
 
diff --git a/src/org/olap4j/transform/TreeNodeCallback.java b/src/org/olap4j/transform/TreeNodeCallback.java
index aa55510..53ae972 100644
--- a/src/org/olap4j/transform/TreeNodeCallback.java
+++ b/src/org/olap4j/transform/TreeNodeCallback.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.transform;
 
diff --git a/src/org/olap4j/type/BooleanType.java b/src/org/olap4j/type/BooleanType.java
index 725ef46..f33e389 100755
--- a/src/org/olap4j/type/BooleanType.java
+++ b/src/org/olap4j/type/BooleanType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/CubeType.java b/src/org/olap4j/type/CubeType.java
index 1cf8c1c..0b1e751 100755
--- a/src/org/olap4j/type/CubeType.java
+++ b/src/org/olap4j/type/CubeType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/DecimalType.java b/src/org/olap4j/type/DecimalType.java
index 3e72299..395a9c3 100755
--- a/src/org/olap4j/type/DecimalType.java
+++ b/src/org/olap4j/type/DecimalType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/DimensionType.java b/src/org/olap4j/type/DimensionType.java
index 3f7f7a0..4b35846 100755
--- a/src/org/olap4j/type/DimensionType.java
+++ b/src/org/olap4j/type/DimensionType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/HierarchyType.java b/src/org/olap4j/type/HierarchyType.java
index 59862b2..cefb981 100755
--- a/src/org/olap4j/type/HierarchyType.java
+++ b/src/org/olap4j/type/HierarchyType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/LevelType.java b/src/org/olap4j/type/LevelType.java
index 070a715..5e41849 100755
--- a/src/org/olap4j/type/LevelType.java
+++ b/src/org/olap4j/type/LevelType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/MemberType.java b/src/org/olap4j/type/MemberType.java
index 9f91664..a15fdee 100644
--- a/src/org/olap4j/type/MemberType.java
+++ b/src/org/olap4j/type/MemberType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/NullType.java b/src/org/olap4j/type/NullType.java
index 1d65bbc..89eb71a 100755
--- a/src/org/olap4j/type/NullType.java
+++ b/src/org/olap4j/type/NullType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/NumericType.java b/src/org/olap4j/type/NumericType.java
index 1d6151a..e419b39 100755
--- a/src/org/olap4j/type/NumericType.java
+++ b/src/org/olap4j/type/NumericType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/ScalarType.java b/src/org/olap4j/type/ScalarType.java
index af54730..b55e7e2 100755
--- a/src/org/olap4j/type/ScalarType.java
+++ b/src/org/olap4j/type/ScalarType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/SetType.java b/src/org/olap4j/type/SetType.java
index e0daef0..48045a1 100755
--- a/src/org/olap4j/type/SetType.java
+++ b/src/org/olap4j/type/SetType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/StringType.java b/src/org/olap4j/type/StringType.java
index 5617040..69886cc 100755
--- a/src/org/olap4j/type/StringType.java
+++ b/src/org/olap4j/type/StringType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/SymbolType.java b/src/org/olap4j/type/SymbolType.java
index 56472b0..7420674 100755
--- a/src/org/olap4j/type/SymbolType.java
+++ b/src/org/olap4j/type/SymbolType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/TupleType.java b/src/org/olap4j/type/TupleType.java
index e51491e..0a25b93 100755
--- a/src/org/olap4j/type/TupleType.java
+++ b/src/org/olap4j/type/TupleType.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/Type.java b/src/org/olap4j/type/Type.java
index 1c9fc0a..4cc0365 100644
--- a/src/org/olap4j/type/Type.java
+++ b/src/org/olap4j/type/Type.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/src/org/olap4j/type/TypeUtil.java b/src/org/olap4j/type/TypeUtil.java
index 9925cf1..7c718ed 100755
--- a/src/org/olap4j/type/TypeUtil.java
+++ b/src/org/olap4j/type/TypeUtil.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2005-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.type;
 
diff --git a/subfloor.xml b/subfloor.xml
index eed744f..405d038 100644
--- a/subfloor.xml
+++ b/subfloor.xml
@@ -1,23 +1,23 @@
 <!--===========================================================================
 /*
- * This program is free software; you can redistribute it and/or modify it under the 
- * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software 
- * Foundation.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this 
- * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html 
- * or from the Free Software Foundation, Inc., 
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
- *
- * Copyright 2008 - 2009 Pentaho Corporation.  All rights reserved.
- *
- * Created Sept 9, 2008
- * @authors Aaron Phillips, David Kincade, Will Gorman, et al.
- */
+// $Id: subfloor.xml $
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
+*/
 
     == SUBFLOOR.XML==
     
diff --git a/test.properties b/test.properties
index d352545..030adb6 100644
--- a/test.properties
+++ b/test.properties
@@ -1,10 +1,21 @@
+#
 # $Id:$
-# This software is subject to the terms of the Eclipse Public License v1.0
-# Agreement, available at the following URL:
-# http://www.eclipse.org/legal/epl-v10.html.
-# Copyright (C) 2007-2009 Julian Hyde and others.
-# All Rights Reserved.
-# You must accept the terms of that agreement to use this software.
+#
+# Licensed to Julian Hyde under one or more contributor license
+# agreements. See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.
+#
+# Julian Hyde 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.
 #
 ###############################################################################
 # This is the default repo file to allow CI builds to function properly.
diff --git a/testsrc/org/olap4j/CellSetFormatterTest.java b/testsrc/org/olap4j/CellSetFormatterTest.java
index a05b4b4..877a6f2 100644
--- a/testsrc/org/olap4j/CellSetFormatterTest.java
+++ b/testsrc/org/olap4j/CellSetFormatterTest.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2009-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/testsrc/org/olap4j/ConnectionTest.java b/testsrc/org/olap4j/ConnectionTest.java
index 348a04b..484326b 100644
--- a/testsrc/org/olap4j/ConnectionTest.java
+++ b/testsrc/org/olap4j/ConnectionTest.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/testsrc/org/olap4j/MetadataTest.java b/testsrc/org/olap4j/MetadataTest.java
index 97d33f5..d5c94e1 100644
--- a/testsrc/org/olap4j/MetadataTest.java
+++ b/testsrc/org/olap4j/MetadataTest.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/testsrc/org/olap4j/OlapTest.java b/testsrc/org/olap4j/OlapTest.java
index 179fb36..9f242a8 100644
--- a/testsrc/org/olap4j/OlapTest.java
+++ b/testsrc/org/olap4j/OlapTest.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/testsrc/org/olap4j/OlapTreeTest.java b/testsrc/org/olap4j/OlapTreeTest.java
index b340059..a76d712 100644
--- a/testsrc/org/olap4j/OlapTreeTest.java
+++ b/testsrc/org/olap4j/OlapTreeTest.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/testsrc/org/olap4j/RemoteXmlaTester.java b/testsrc/org/olap4j/RemoteXmlaTester.java
index 5f22190..bc1effd 100644
--- a/testsrc/org/olap4j/RemoteXmlaTester.java
+++ b/testsrc/org/olap4j/RemoteXmlaTester.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
diff --git a/testsrc/org/olap4j/XmlaConnectionTest.java b/testsrc/org/olap4j/XmlaConnectionTest.java
index 2140e2d..4d21ead 100644
--- a/testsrc/org/olap4j/XmlaConnectionTest.java
+++ b/testsrc/org/olap4j/XmlaConnectionTest.java
@@ -1,3 +1,22 @@
+/*
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
+*/
 package org.olap4j;
 
 import org.olap4j.driver.xmla.XmlaOlap4jDriver;
@@ -15,6 +34,11 @@
 import java.util.*;
 import java.util.concurrent.Future;
 
+/**
+ * Unit test for XMLA driver connections.
+ *
+ * @version $Id$
+ */
 public class XmlaConnectionTest extends TestCase {
 
     public static final String DRIVER_CLASS_NAME =
@@ -341,8 +365,3 @@ private static String convertToHex(byte[] data) {
 }
 
 // End XmlaConnectionTest.java
-
-
-
-
-
diff --git a/testsrc/org/olap4j/XmlaTester.java b/testsrc/org/olap4j/XmlaTester.java
index 304ae49..cff2693 100644
--- a/testsrc/org/olap4j/XmlaTester.java
+++ b/testsrc/org/olap4j/XmlaTester.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j;
 
@@ -27,7 +38,7 @@
 public class XmlaTester implements TestContext.Tester {
     private final TestContext testContext;
     final XmlaOlap4jProxy proxy;
-    final static String cookie = XmlaOlap4jDriver.nextCookie();
+    static final String cookie = XmlaOlap4jDriver.nextCookie();
     private Connection connection;
 
     /**
diff --git a/testsrc/org/olap4j/driver/xmla/cache/XmlaDatabaseCache.java b/testsrc/org/olap4j/driver/xmla/cache/XmlaDatabaseCache.java
index 75de591..03388ae 100644
--- a/testsrc/org/olap4j/driver/xmla/cache/XmlaDatabaseCache.java
+++ b/testsrc/org/olap4j/driver/xmla/cache/XmlaDatabaseCache.java
@@ -1,3 +1,22 @@
+/*
+// $Id: $
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
+*/
 package org.olap4j.driver.xmla.cache;
 
 import java.net.URL;
@@ -7,13 +26,15 @@
 /**
  * This mock server cache is only used to save and load
  * runs of the XMLA driver as a database table.
+ *
  * @see Properties
  * @author LBoudreau
+ * @version $Id: $
  */
 public class XmlaDatabaseCache implements XmlaOlap4jCache {
 
     private static Connection connection = null;
-    private final static String CACHE_IDENT = "Panda steak!";
+    private static final String CACHE_IDENT = "Panda steak!";
     private Map<String, String> props;
 
     public static enum Properties {
@@ -189,5 +210,3 @@ public String setParameters(
 }
 
 // End XmlaDatabaseCache.java
-
-
diff --git a/testsrc/org/olap4j/driver/xmla/cache/XmlaShaEncoderTest.java b/testsrc/org/olap4j/driver/xmla/cache/XmlaShaEncoderTest.java
index 26877c4..58da5dc 100644
--- a/testsrc/org/olap4j/driver/xmla/cache/XmlaShaEncoderTest.java
+++ b/testsrc/org/olap4j/driver/xmla/cache/XmlaShaEncoderTest.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.cache;
 
diff --git a/testsrc/org/olap4j/driver/xmla/proxy/XmlaCachedProxyTest.java b/testsrc/org/olap4j/driver/xmla/proxy/XmlaCachedProxyTest.java
index fba507d..d307f10 100644
--- a/testsrc/org/olap4j/driver/xmla/proxy/XmlaCachedProxyTest.java
+++ b/testsrc/org/olap4j/driver/xmla/proxy/XmlaCachedProxyTest.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.proxy;
 
diff --git a/testsrc/org/olap4j/driver/xmla/proxy/XmlaCookieManagerTest.java b/testsrc/org/olap4j/driver/xmla/proxy/XmlaCookieManagerTest.java
index 213c973..d0dbeea 100644
--- a/testsrc/org/olap4j/driver/xmla/proxy/XmlaCookieManagerTest.java
+++ b/testsrc/org/olap4j/driver/xmla/proxy/XmlaCookieManagerTest.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2011 Julian Hyde and others
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.driver.xmla.proxy;
 
@@ -24,8 +34,8 @@
 public class XmlaCookieManagerTest extends TestCase {
 
     private static final String receivedCookieKey = "Set-Cookie";
-    public final static String sentCookieKey = "Cookie";
-    public final static String cookieValue =
+    public static final String sentCookieKey = "Cookie";
+    public static final String cookieValue =
         "MyTestCookie=271B79EBCBAAA37C5C51B1979441E5AC";
 
 
diff --git a/testsrc/org/olap4j/impl/Base64Test.java b/testsrc/org/olap4j/impl/Base64Test.java
index 32cbd47..0cfd873 100644
--- a/testsrc/org/olap4j/impl/Base64Test.java
+++ b/testsrc/org/olap4j/impl/Base64Test.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2011 Julian Hyde and others
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/testsrc/org/olap4j/impl/ConnectStringParserTest.java b/testsrc/org/olap4j/impl/ConnectStringParserTest.java
index 1dd8d99..df8a0c4 100644
--- a/testsrc/org/olap4j/impl/ConnectStringParserTest.java
+++ b/testsrc/org/olap4j/impl/ConnectStringParserTest.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/testsrc/org/olap4j/impl/Olap4jUtilTest.java b/testsrc/org/olap4j/impl/Olap4jUtilTest.java
index 1a6829e..b4aef14 100644
--- a/testsrc/org/olap4j/impl/Olap4jUtilTest.java
+++ b/testsrc/org/olap4j/impl/Olap4jUtilTest.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.impl;
 
diff --git a/testsrc/org/olap4j/mdx/MdxTest.java b/testsrc/org/olap4j/mdx/MdxTest.java
index 81e1105..66906e9 100644
--- a/testsrc/org/olap4j/mdx/MdxTest.java
+++ b/testsrc/org/olap4j/mdx/MdxTest.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.mdx;
 
diff --git a/testsrc/org/olap4j/test/ArrayMapTest.java b/testsrc/org/olap4j/test/ArrayMapTest.java
index dc79001..339138e 100644
--- a/testsrc/org/olap4j/test/ArrayMapTest.java
+++ b/testsrc/org/olap4j/test/ArrayMapTest.java
@@ -1,10 +1,21 @@
 /*
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+// $Id$
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.test;
 
diff --git a/testsrc/org/olap4j/test/ParserTest.java b/testsrc/org/olap4j/test/ParserTest.java
index fd82770..8a570ba 100644
--- a/testsrc/org/olap4j/test/ParserTest.java
+++ b/testsrc/org/olap4j/test/ParserTest.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.test;
 
diff --git a/testsrc/org/olap4j/test/TestContext.java b/testsrc/org/olap4j/test/TestContext.java
index ac3cae8..a0625b2 100644
--- a/testsrc/org/olap4j/test/TestContext.java
+++ b/testsrc/org/olap4j/test/TestContext.java
@@ -1,11 +1,21 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2007-2011 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
 */
 package org.olap4j.test;
 
diff --git a/testsrc/org/olap4j/transform/TransformTest.java b/testsrc/org/olap4j/transform/TransformTest.java
index 26c94bd..68ad1da 100644
--- a/testsrc/org/olap4j/transform/TransformTest.java
+++ b/testsrc/org/olap4j/transform/TransformTest.java
@@ -1,12 +1,22 @@
 /*
 // $Id$
-// This software is subject to the terms of the Eclipse Public License v1.0
-// Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2008-2010 Julian Hyde
-// All Rights Reserved.
-// You must accept the terms of that agreement to use this software.
- */
+//
+// Licensed to Julian Hyde under one or more contributor license
+// agreements. See the NOTICE file distributed with this work for
+// additional information regarding copyright ownership.
+//
+// Julian Hyde 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.
+*/
 package org.olap4j.transform;
 
 import org.olap4j.*;