See <http://ci.pentaho.com/job/mondrian-3.1/57/changes>

Changes:

[Will Gorman] MONDRIAN: Integrate from //open/lu/release/mondrian/wm@13174 into Mondrian 3.1

[Will Gorman] MONDRIAN: Integrate from //open/lu/release/mondrian/wm@13174 into Mondrian-3.1 branch

------------------------------------------
[...truncated 416 lines...]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol CELL
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol DIMENSION
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol ELSE
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol END
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol IN
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol IS
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol MATCHES
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol MEMBER
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol NOT
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol ON
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol OR
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol PROPERTIES
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol SELECT
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol SET
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol THEN
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol WHEN
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol XOR
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol COLON
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol COMMA
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol EQ
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol GE
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol GT
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol LE
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol LT
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol NE
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol RBRACE
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] *** Shift/Reduce conflict found in state #103
[javacup] between term3 ::= term3 IS NULL (*)
[javacup] under symbol RPAREN
[javacup] Resolved in favor of shifting.
[javacup]
[javacup] Checking for non-reduced productions...
[javacup] Writing parser...
[javacup] Closing files...
[javacup] ------- CUP v0.10k Parser Generation Summary -------
[javacup] 0 errors and 63 warnings
[javacup] 62 terminals, 60 non-terminals, and 132 productions declared,
[javacup] producing 201 unique parse states.
[javacup] 2 terminals declared but not used.
[javacup] 0 non-terminals declared but not used.
[javacup] 0 productions never reduced.
[javacup] 61 conflicts detected (61 expected).
[javacup] Code written to "Parser.java", and "ParserSym.java".
[javacup] ---------------------------------------------------- (v0.10k)

generate.resources:
[javac] Compiling 7 source files to <http://ci.pentaho.com/job/mondrian-3.1/ws/classes>
[resgen] Generating <http://ci.pentaho.com/job/mondrian-3.1/ws/src/main/mondrian/resource/MondrianResource.java>
[resgen] Generating <http://ci.pentaho.com/job/mondrian-3.1/ws/classes/mondrian/resource/MondrianResource.properties>
[resgen] Generating <http://ci.pentaho.com/job/mondrian-3.1/ws/src/main/mondrian/resource/MondrianResource_en_US.java>
[resgen] Generating <http://ci.pentaho.com/job/mondrian-3.1/ws/classes/mondrian/resource/MondrianResource_en_US.properties>
[resgen] Generating <http://ci.pentaho.com/job/mondrian-3.1/ws/src/main/mondrian/resource/MondrianResource_de_DE.java>
[resgen] Generating <http://ci.pentaho.com/job/mondrian-3.1/ws/classes/mondrian/resource/MondrianResource_de_DE.properties>
[resgen] Generating <http://ci.pentaho.com/job/mondrian-3.1/ws/src/main/mondrian/resource/MondrianResource_de.java>
[resgen] Generating <http://ci.pentaho.com/job/mondrian-3.1/ws/classes/mondrian/resource/MondrianResource_de.properties>
[resgen] Generating <http://ci.pentaho.com/job/mondrian-3.1/ws/src/main/mondrian/resource/MondrianResource_es_ES.java>
[resgen] Generating <http://ci.pentaho.com/job/mondrian-3.1/ws/classes/mondrian/resource/MondrianResource_es_ES.properties>

def:
[xomgen] Writing <http://ci.pentaho.com/job/mondrian-3.1/ws/src/main/mondrian/olap/mondrian.dtd>
[xomgen] Writing <http://ci.pentaho.com/job/mondrian-3.1/ws/src/main/mondrian/olap/MondrianDef.java>
[xomgen] Done
[copy] Copying 1 file to <http://ci.pentaho.com/job/mondrian-3.1/ws/lib>
[xomgen] Writing <http://ci.pentaho.com/job/mondrian-3.1/ws/src/main/mondrian/gui/mondrian_SW.dtd>
[xomgen] Writing <http://ci.pentaho.com/job/mondrian-3.1/ws/src/main/mondrian/gui/MondrianGuiDef.java>
[xomgen] Done
[copy] Copying 1 file to <http://ci.pentaho.com/job/mondrian-3.1/ws/lib>
[xomgen] Writing <http://ci.pentaho.com/job/mondrian-3.1/ws/src/main/mondrian/xmla/datasourcesconfig.dtd>
[xomgen] Writing <http://ci.pentaho.com/job/mondrian-3.1/ws/src/main/mondrian/xmla/DataSourcesConfig.java>
[xomgen] Done
[copy] Copying 1 file to <http://ci.pentaho.com/job/mondrian-3.1/ws/lib>

compile.java:
[javac] Compiling 576 source files to <http://ci.pentaho.com/job/mondrian-3.1/ws/classes>
[javac] Note: Some input files use or override a deprecated API.
[javac] Note: Recompile with -Xlint:deprecation for details.
[javac] Note: Some input files use unchecked or unsafe operations.
[javac] Note: Recompile with -Xlint:unchecked for details.
[copy] Copying 1 file to <http://ci.pentaho.com/job/mondrian-3.1/ws/classes>
[copy] Copying 1 file to <http://ci.pentaho.com/job/mondrian-3.1/ws/classes>
[copy] Copying 3 files to <http://ci.pentaho.com/job/mondrian-3.1/ws/classes>

compile:

info:
[echo] ================================================== ============
[echo] | Mondrian configuration info |
[echo] ================================================== ============
[echo] project.location = <http://ci.pentaho.com/job/mondrian-3.1/ws/>
[echo] jdk.home = /opt/java5
[echo] catalina.home = ${env.CATALINA_HOME}
[echo] junit.home = ${env.JUNIT_HOME}
[echo] log4j.configuration = log4j.properties
[echo] mondrian.foodmart.catalogURL = <http://ci.pentaho.com/job/mondrian-3.1/ws/demo/FoodMart.xml>
[echo] mondrian.foodmart.jdbcURL = jdbcdbc:MondrianFoodMart
[echo] mondrian.jdbcDrivers = sun.jdbc.odbc.JdbcOdbcDriver
[echo] driver.classpath (additions) =
[echo] ================================================== ============

compile.tests:
[javac] Compiling 148 source files to <http://ci.pentaho.com/job/mondrian-3.1/ws/testclasses>
[javac] <http://ci.pentaho.com/job/mondrian-3.1/ws/testsrc/main/mondrian/rolap/FilterTest.java>:274: cannot find symbol
[javac] symbol : method fold(java.lang.String)
[javac] location: class mondrian.rolap.FilterTest
[javac] checkNative(0, 10, query, fold(result), requestFreshConnection);
[javac] ^
[javac] <http://ci.pentaho.com/job/mondrian-3.1/ws/testsrc/main/mondrian/rolap/FilterTest.java>:328: cannot find symbol
[javac] symbol : method fold(java.lang.String)
[javac] location: class mondrian.rolap.FilterTest
[javac] checkNative(0, 9, query, fold(result), requestFreshConnection);
[javac] ^
[javac] <http://ci.pentaho.com/job/mondrian-3.1/ws/testsrc/main/mondrian/rolap/FilterTest.java>:784: cannot find symbol
[javac] symbol : method fold(java.lang.String)
[javac] location: class mondrian.rolap.FilterTest
[javac] checkNative(0, 8, query, fold(result), requestFreshConnection);
[javac] ^
[javac] <http://ci.pentaho.com/job/mondrian-3.1/ws/testsrc/main/mondrian/rolap/FilterTest.java>:836: cannot find symbol
[javac] symbol : method fold(java.lang.String)
[javac] location: class mondrian.rolap.FilterTest
[javac] checkNotNative(9, query, fold(result));
[javac] ^
[javac] <http://ci.pentaho.com/job/mondrian-3.1/ws/testsrc/main/mondrian/rolap/FilterTest.java>:878: cannot find symbol
[javac] symbol : method fold(java.lang.String)
[javac] location: class mondrian.rolap.FilterTest
[javac] context.assertQueryReturns(query, fold(result));
[javac] ^
[javac] <http://ci.pentaho.com/job/mondrian-3.1/ws/testsrc/main/mondrian/rolap/FilterTest.java>:912: cannot find symbol
[javac] symbol : method fold(java.lang.String)
[javac] location: class mondrian.rolap.FilterTest
[javac] checkNotNative(3, query, fold(result));
[javac] ^
[javac] Note: Some input files use or override a deprecated API.
[javac] Note: Recompile with -Xlint:deprecation for details.
[javac] Note: Some input files use unchecked or unsafe operations.
[javac] Note: Recompile with -Xlint:unchecked for details.
[javac] 6 errors

BUILD FAILED
<http://ci.pentaho.com/job/mondrian-3.1/ws/build.xml>:567: Compile failed; see the compiler error output for details.

Total time: 38 seconds
Archiving artifacts
Recording test results
Recording fingerprints
Skipping Cobertura coverage report as build was not UNSTABLE or better ...

_______________________________________________
Mondrian mailing list
Mondrian (AT) pentaho (DOT) org
http://lists.pentaho.org/mailman/listinfo/mondrian