Updated Branches: refs/heads/master 4490c700d -> dc6ecc78c
Adds JDK 7 compatability. By Andrew Kaplanov https://reviews.apache.org/r/16538 Adds updated test related jars + updates Eclipse classpath Removes -Werror flag from build Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/dc6ecc78 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/dc6ecc78 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/dc6ecc78 Branch: refs/heads/master Commit: dc6ecc78c2a0bf5fa96501de55f0f6771f58477b Parents: 4490c70 Author: Yuri Zelikov <[email protected]> Authored: Tue Dec 31 18:16:39 2013 +0200 Committer: Yuri Zelikov <[email protected]> Committed: Tue Dec 31 22:23:23 2013 +0200 ---------------------------------------------------------------------- .classpath | 6 +++--- build-macros.xml | 8 +++++--- build.properties | 3 +++ .../wave/client/paging/AbstractTreeNode.java | 14 +++++++------- third_party/test/jmock/README.google | 4 ++-- third_party/test/jmock/jmock-2.5.1.jar | Bin 241000 -> 0 bytes third_party/test/jmock/jmock-2.6.0.jar | Bin 0 -> 182977 bytes third_party/test/jmock/jmock-junit3-2.5.1.jar | Bin 16043 -> 0 bytes third_party/test/jmock/jmock-junit3-2.6.0.jar | Bin 0 -> 10759 bytes third_party/test/mockito/README.google | 2 +- third_party/test/mockito/mockito-all-1.8.2.jar | Bin 1347380 -> 0 bytes third_party/test/mockito/mockito-all-1.9.5.jar | Bin 0 -> 1581066 bytes 12 files changed, 21 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dc6ecc78/.classpath ---------------------------------------------------------------------- diff --git a/.classpath b/.classpath index a379bf2..b4632d5 100644 --- a/.classpath +++ b/.classpath @@ -54,11 +54,8 @@ <classpathentry kind="lib" path="third_party/test/emma/emma.jar"/> <classpathentry kind="lib" path="third_party/test/emma/emma_ant.jar"/> <classpathentry kind="lib" path="third_party/test/hamcrest/hamcrest-all-1.2.jar"/> - <classpathentry kind="lib" path="third_party/test/jmock/jmock-2.5.1.jar"/> - <classpathentry kind="lib" path="third_party/test/jmock/jmock-junit3-2.5.1.jar"/> <classpathentry kind="lib" path="third_party/test/junit/junit.jar"/> <classpathentry kind="lib" path="third_party/test/junit/src.jar"/> - <classpathentry kind="lib" path="third_party/test/mockito/mockito-all-1.8.2.jar"/> <classpathentry kind="lib" path="third_party/runtime/jetty/jetty-client-8.1.1.v20120215.jar"/> <classpathentry kind="lib" path="third_party/runtime/jetty/jetty-continuation-8.1.1.v20120215.jar"/> <classpathentry kind="lib" path="third_party/runtime/jetty/jetty-http-8.1.1.v20120215.jar"/> @@ -77,5 +74,8 @@ <classpathentry kind="lib" path="third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT.jar" sourcepath="third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT-sources.jar"/> <classpathentry kind="lib" path="third_party/runtime/commons-fileupload/commons-fileupload.jar" sourcepath="third_party/runtime/commons-fileupload/commons-fileupload-src.zip"/> <classpathentry kind="lib" path="third_party/runtime/lucene/lucene-core-3.5.0.jar"/> + <classpathentry kind="lib" path="third_party/test/jmock/jmock-2.6.0.jar"/> + <classpathentry kind="lib" path="third_party/test/jmock/jmock-junit3-2.6.0.jar"/> + <classpathentry kind="lib" path="third_party/test/mockito/mockito-all-1.9.5.jar"/> <classpathentry kind="output" path="bin"/> </classpath> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dc6ecc78/build-macros.xml ---------------------------------------------------------------------- diff --git a/build-macros.xml b/build-macros.xml index f8813d4..3f7fae9 100644 --- a/build-macros.xml +++ b/build-macros.xml @@ -68,13 +68,14 @@ <javac destdir="@{destdir}" debug="true"> <exclude name="org/waveprotocol/pst/**"/> <patternset refid="@{srcpattern}"/> - <!-- TODO(anorth): enable -Werror after fixing warnings. --> - <compilerarg value="-Werror"/> <compilerarg value="-Xlint:all"/> <compilerarg value="-Xlint:-serial"/> <!-- Deprecation warnings are generated for .class files for some compilers, e.g. org.hamcrest.Matcher -> org.hamcrest.BaseMatcher. --> <compilerarg value="-Xlint:-deprecation"/> + <!-- TODO(akaplanov): remove -Xlint:-static after protobuf issue will be fixed + issue --> + <compilerarg value="-Xlint:-static"/> <javac-elements/> </javac> </sequential> @@ -112,9 +113,10 @@ metadatafile="${coverage.dir}/metadata.emma" mode="copy"/> </emma> - <junit fork="yes" forkmode="@{forkmode}" printsummary="yes" + <junit fork="yes" forkmode="@{forkmode}" printsummary="yes" showoutput="no" haltonfailure="no" failureProperty="test.failed"> <jvmarg value="-Xmx512M"/> + <jvmarg value="-XX:-UseSplitVerifier"/> <jvmarg value="-ea"/> <!-- Emma arguments --> <jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" /> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dc6ecc78/build.properties ---------------------------------------------------------------------- diff --git a/build.properties b/build.properties index 38a5e66..b042880 100644 --- a/build.properties +++ b/build.properties @@ -69,3 +69,6 @@ robotclient.jar.out=${dist.dir}/${name}-wave-api-${waveinabox.version}.jar export-import.jar.out=${dist.dir}/${name}-export-import-${waveinabox.version}.jar missing.dependencies.test=You need to execute the get-third-party target to download dependencies required for tests compilation, i.e. ant get-third-party. + +# Javac properties +build.properties:javac.source = 1.7 http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dc6ecc78/src/org/waveprotocol/wave/client/paging/AbstractTreeNode.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/client/paging/AbstractTreeNode.java b/src/org/waveprotocol/wave/client/paging/AbstractTreeNode.java index 14f12a5..d91a0f4 100644 --- a/src/org/waveprotocol/wave/client/paging/AbstractTreeNode.java +++ b/src/org/waveprotocol/wave/client/paging/AbstractTreeNode.java @@ -38,11 +38,11 @@ public abstract class AbstractTreeNode<T extends AbstractTreeNode<T>> implements // * first is null <=> last is null // * next or prev is non-null => parent is non-null // - private T parent; - private T first; - private T last; - private T next; - private T prev; + protected T parent; + protected T first; + protected T last; + protected T next; + protected T prev; protected AbstractTreeNode() { } @@ -81,7 +81,7 @@ public abstract class AbstractTreeNode<T extends AbstractTreeNode<T>> implements /** * Sets the external structural fields of this node. */ - private T set(T parent, T prev, T next) { + protected T set(T parent, T prev, T next) { this.parent = parent; this.prev = prev; this.next = next; @@ -151,7 +151,7 @@ public abstract class AbstractTreeNode<T extends AbstractTreeNode<T>> implements * * @param child node to remove */ - private void removeChild(T child) { + protected void removeChild(T child) { if (child == first) { first = child.next; } else { http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dc6ecc78/third_party/test/jmock/README.google ---------------------------------------------------------------------- diff --git a/third_party/test/jmock/README.google b/third_party/test/jmock/README.google index 271377b..e138cc3 100644 --- a/third_party/test/jmock/README.google +++ b/third_party/test/jmock/README.google @@ -1,11 +1,11 @@ URL: http://jmock.org/ -Version: 2.5.1 +Version: 2.6.0 License: BSD License File: jmock-license.txt Description: -JMock is a library that supports test-driven development of Java code with +JMock is a library that supports test-driven development of Java code with mock objects. Local Modifications: http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dc6ecc78/third_party/test/jmock/jmock-2.5.1.jar ---------------------------------------------------------------------- diff --git a/third_party/test/jmock/jmock-2.5.1.jar b/third_party/test/jmock/jmock-2.5.1.jar deleted file mode 100644 index 4415dfb..0000000 Binary files a/third_party/test/jmock/jmock-2.5.1.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dc6ecc78/third_party/test/jmock/jmock-2.6.0.jar ---------------------------------------------------------------------- diff --git a/third_party/test/jmock/jmock-2.6.0.jar b/third_party/test/jmock/jmock-2.6.0.jar new file mode 100644 index 0000000..d1f81ad Binary files /dev/null and b/third_party/test/jmock/jmock-2.6.0.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dc6ecc78/third_party/test/jmock/jmock-junit3-2.5.1.jar ---------------------------------------------------------------------- diff --git a/third_party/test/jmock/jmock-junit3-2.5.1.jar b/third_party/test/jmock/jmock-junit3-2.5.1.jar deleted file mode 100644 index 7dfc4b3..0000000 Binary files a/third_party/test/jmock/jmock-junit3-2.5.1.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dc6ecc78/third_party/test/jmock/jmock-junit3-2.6.0.jar ---------------------------------------------------------------------- diff --git a/third_party/test/jmock/jmock-junit3-2.6.0.jar b/third_party/test/jmock/jmock-junit3-2.6.0.jar new file mode 100644 index 0000000..8f8adb0 Binary files /dev/null and b/third_party/test/jmock/jmock-junit3-2.6.0.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dc6ecc78/third_party/test/mockito/README.google ---------------------------------------------------------------------- diff --git a/third_party/test/mockito/README.google b/third_party/test/mockito/README.google index 7fc04fb..7ed5929 100644 --- a/third_party/test/mockito/README.google +++ b/third_party/test/mockito/README.google @@ -1,5 +1,5 @@ URL: http://mockito.org/ -Version: 1.8.2 +Version: 1.9.5 License: MIT License File: LICENSE http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dc6ecc78/third_party/test/mockito/mockito-all-1.8.2.jar ---------------------------------------------------------------------- diff --git a/third_party/test/mockito/mockito-all-1.8.2.jar b/third_party/test/mockito/mockito-all-1.8.2.jar deleted file mode 100644 index 74c2789..0000000 Binary files a/third_party/test/mockito/mockito-all-1.8.2.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dc6ecc78/third_party/test/mockito/mockito-all-1.9.5.jar ---------------------------------------------------------------------- diff --git a/third_party/test/mockito/mockito-all-1.9.5.jar b/third_party/test/mockito/mockito-all-1.9.5.jar new file mode 100644 index 0000000..00416eb Binary files /dev/null and b/third_party/test/mockito/mockito-all-1.9.5.jar differ
