Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Sets Eclipse JRE setting to an execution environment value rather tha…

…n a full JRE. This should prevent us from using com.sun.* forbidden packages.

Removes a dependency on log4j that was introduced by the Scanner class. It was only used for debug tracing and there is no reason for it.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@308 c6a108a4-781c-0410-a6c6-c2d559e19af0
  • Loading branch information...
commit 41c74ea85b6801f41da92a8e2483dcb87604e141 1 parent cc9f9d1
@lucboudreau lucboudreau authored
View
58 .classpath
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="testsrc"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-1.5.0_11"/>
- <classpathentry kind="lib" path="lib/asm-commons.jar"/>
- <classpathentry kind="lib" path="lib/asm.jar"/>
- <classpathentry kind="lib" path="lib/javacup.jar"/>
- <classpathentry kind="lib" path="lib/log4j.jar"/>
- <classpathentry kind="lib" path="lib/retroweaver-rt.jar"/>
- <classpathentry kind="lib" path="lib/retroweaver.jar"/>
- <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
- <classpathentry kind="lib" path="testlib/commons-collections.jar"/>
- <classpathentry kind="lib" path="testlib/commons-dbcp.jar"/>
- <classpathentry kind="lib" path="testlib/commons-logging.jar"/>
- <classpathentry kind="lib" path="testlib/commons-math.jar"/>
- <classpathentry kind="lib" path="testlib/commons-pool.jar"/>
- <classpathentry kind="lib" path="testlib/commons-vfs.jar"/>
- <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/pdfdoclet.jar"/>
- <classpathentry kind="lib" path="testlib/servlet-api.jar"/>
- <classpathentry kind="lib" path="testlib/simple-jndi.jar"/>
- <classpathentry kind="lib" path="testlib/mondrian.jar"/>
- <classpathentry kind="output" path="eclipse-bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="testsrc"/>
+ <classpathentry kind="lib" path="lib/asm-commons.jar"/>
+ <classpathentry kind="lib" path="lib/asm.jar"/>
+ <classpathentry kind="lib" path="lib/javacup.jar"/>
+ <classpathentry kind="lib" path="lib/retroweaver-rt.jar"/>
+ <classpathentry kind="lib" path="lib/retroweaver.jar"/>
+ <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="testlib/commons-collections.jar"/>
+ <classpathentry kind="lib" path="testlib/commons-dbcp.jar"/>
+ <classpathentry kind="lib" path="testlib/commons-logging.jar"/>
+ <classpathentry kind="lib" path="testlib/commons-math.jar"/>
+ <classpathentry kind="lib" path="testlib/commons-pool.jar"/>
+ <classpathentry kind="lib" path="testlib/commons-vfs.jar"/>
+ <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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="output" path="eclipse-bin"/>
+</classpath>
View
3  .settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
-#Sat Sep 02 07:10:09 PDT 2006
+#Wed Apr 07 16:39:43 EDT 2010
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
View
6 ivy.xml
@@ -25,9 +25,6 @@
<dependency org="javacup" name="javacup" rev="10k"
transitive="false" />
- <dependency org="log4j" name="log4j" rev="1.2.9"
- transitive="false" />
-
<!-- get retroweaver from Pentaho repo since ibilio one is corrupted -->
<dependency org="retroweaver" name="retroweaver" rev="1.2.4"
transitive="false" />
@@ -40,6 +37,9 @@
<!-- test deps here -->
+ <dependency org="log4j" name="log4j" rev="1.2.9"
+ transitive="false" conf="test->default" />
+
<dependency org="commons-dbcp" name="commons-dbcp" rev="1.1"
transitive="false" conf="test->default" />
View
18 src/org/olap4j/mdx/parser/impl/Scanner.java
@@ -9,7 +9,6 @@
*/
package org.olap4j.mdx.parser.impl;
-import org.apache.log4j.Logger;
import org.olap4j.mdx.ParseRegion;
import org.olap4j.mdx.parser.MdxParseException;
@@ -31,7 +30,6 @@
* @author jhyde
*/
class Scanner {
- private static final Logger LOGGER = Logger.getLogger(Scanner.class);
/** single lookahead character */
protected int nextChar;
@@ -194,20 +192,6 @@ public void init()
advance();
}
- private Symbol trace(Symbol s) {
- if (debug) {
- String name = null;
- if (s.sym < reservedWords.length) {
- name = reservedWords[s.sym];
- }
-
- LOGGER.error("Scanner returns #" + s.sym +
- (name == null ? "" : ":" + name) +
- (s.value == null ? "" : "(" + s.value.toString() + ")"));
- }
- return s;
- }
-
private void initResword(int id, String s) {
reservedWordIds.put(s, id);
if (id > iMaxResword) {
@@ -302,7 +286,7 @@ private Symbol makeSymbol(int id, Object o) {
int iPrevPrevChar = iPrevChar;
this.iPrevChar = iChar;
this.previousSymbol = id;
- return trace(new Symbol(id, iPrevPrevChar, iChar, o));
+ return new Symbol(id, iPrevPrevChar, iChar, o);
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.