Some work to get ready for the 1.1.0 release. Also fixes a problem wi…

…th the ant script. The file nls.properties was not part of the classpath when running the tests form Ant.
hypnoce · Jan 14, 2013 · 10a62e1 · 10a62e1
1 parent 57c24f6
commit 10a62e1
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 16 deletions.
diff --git a/.classpath b/.classpath
@@ -12,14 +12,13 @@
 	<classpathentry kind="lib" path="testlib/eigenbase-properties.jar"/>
 	<classpathentry kind="lib" path="testlib/eigenbase-resgen.jar"/>
 	<classpathentry kind="lib" path="testlib/eigenbase-xom.jar"/>
-	<classpathentry kind="lib" path="testlib/hsqldb.jar"/>
 	<classpathentry kind="lib" path="testlib/junit.jar"/>
 	<classpathentry kind="lib" path="testlib/log4j.jar"/>
 	<classpathentry kind="lib" path="testlib/mondrian.jar"/>
 	<classpathentry kind="lib" path="testlib/pdfdoclet.jar"/>
 	<classpathentry kind="lib" path="testlib/servlet-api.jar"/>
-	<classpathentry kind="lib" path="testlib/simple-jndi.jar"/>
 	<classpathentry kind="lib" path="dev-lib/mysql-connector-java-5.1.13-bin.jar"/>
+	<classpathentry kind="lib" path="testlib/olap4j-xmlaserver.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="lib" path="lib/javacc.jar"/>
 	<classpathentry kind="output" path="eclipse-bin"/>

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,6 +2,35 @@
 
 ###############################################################################
 
+# Olap4j 1.1.0
+
+This release is a minor update to the olap4j specification. There have been
+changes to the internal APIs which will affect developers and implementors
+of the specification. This release is backwards compatible with applications
+written against olap4j 1.0.
+
+This release is also the first to introduce our new sister project:
+olap4j-xmlaserver. It consists of a Java Servlet implementation which provides
+XMLA services from an olap4j connection. For more details, consult our GitHub
+page at github.com/olap4j
+
+* New Features / Improvements
+    - Switched to the JavaCC parser (was previously JavaCUP).
+    - Added compatibility with Mondrian 4+.
+    - Minor changes to the NamedList interface.
+
+* Bug Fixes in Core
+    - Fix bug 3526908. Incomplete LCID list.
+    - Fix bug 3515404. Inconsistent behavior when parsing ".CHILDREN" and
+     ".Children"
+
+* Bug Fixes in XMLA
+    - Fixes compatibility issues with Essbase.
+    - Fixes compatibility issues with SAP BW.
+    - Fixes a thread safety issue in DeferredNamedList.
+
+###############################################################################
+
 # Olap4j 1.0.1
 
 This release is a maintenance release and maintains backwards compatibility
@@ -28,6 +57,8 @@ Among other notable changes, this version introduces support for JDBC 4.1.
     - The XmlaDriver now exposes a public constructor to prevent
       errors in Sun's JDBC implementation.
 
+###############################################################################
+
 # Olap4j 1.0.0
 
 Although this file was not kept up to date since a while, we intend to change

diff --git a/README.txt b/README.txt
@@ -1,4 +1,4 @@
-olap4j, release 1.0.1
+olap4j, release 1.1.0
 
 Contents of this distribution
 -----------------------------

diff --git a/build.xml b/build.xml
@@ -455,6 +455,14 @@ class XmlaOlap4jDriverVersion {
                 </copy>
             </then>
         </if>
+        <if>
+            <available file="${src.dir}/org/olap4j/impl/nls.properties" />
+            <then>
+                <copy todir="${classes.dir}/org/olap4j/impl/">
+                    <fileset file="${src.dir}/org/olap4j/impl/nls.properties" />
+                </copy>
+            </then>
+        </if>
     </target>
 
     <!-- override from subfloor to publish tck and xmla artifacts as well -->

diff --git a/doc/index.html b/doc/index.html
@@ -185,29 +185,22 @@
           <td width="100%" valign="top" style="padding-bottom: 10px;">
           <h4>Status</h4>
 
-          <p><b>olap4j 1.0.1 was released on February 7th,
-          2012.</b></p><br/>
+          <p><b>olap4j 1.1.0</b></p><br/>
 
           <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/>
+          Microsoft SQL Server Analysis Services, Palo, SAP
+          BW and Essbase.</p><br/>
 
-          <p>This release is a maintenance release and maintains
-          backwards compatibility with version 1.0.0. The license
-          under which olap4j is distributed has changed starting with
-          this release. Olap4j is now distributed under the Apache
-          Software License Version 2.0.</p><br/>
-
-          <p>Among other notable changes, this version introduces
-          support for JDBC 4.1.</p>
+          <p>This release is a minor release and maintains
+          backwards compatibility with version 1.0.0.</p><br/>
 
           <h4>Resources</h4>
             <ul>
               <li><a href="http://sourceforge.net/p/olap4j/discussion/577988/">Discussion forum</a>.</li>
               <li><a href="http://sourceforge.net/p/olap4j/bugs/">Bug database</a>.</li>
-              <li>Download 1.0.1 <a href="http://sourceforge.net/project/showfiles.php?group_id=168953">release</a></li>
+              <li>Download 1.1.0 <a href="http://sourceforge.net/project/showfiles.php?group_id=168953">release</a></li>
               <li>Specification (<a href="olap4j_fs.pdf">PDF</a>, <a href="olap4j_fs.html">HTML</a>).</li>
               <li><a href="api/index.html">API javadoc</a>.</li>
               <li><a href="http://olap4j-demo.googlecode.com/svn/trunk/doc/Olap4j_Introduction_An_end_user_perspective.pdf">Primer</a>