Repository: incubator-wave Updated Branches: refs/heads/master f698cd9a1 -> da1bdbe3d
Fix superdev classpath issue with jetty and Profiling inherits Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/da1bdbe3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/da1bdbe3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/da1bdbe3 Branch: refs/heads/master Commit: da1bdbe3d5c88aa37a2d4027c9df4899ab768f69 Parents: f698cd9 Author: Vicente J. Ruiz Jurado <[email protected]> Authored: Sat Dec 13 19:01:27 2014 +0100 Committer: Vicente J. Ruiz Jurado <[email protected]> Committed: Sat Dec 13 19:01:27 2014 +0100 ---------------------------------------------------------------------- build.xml | 6 ++++++ src/org/waveprotocol/box/webclient/WebClientDev.gwt.xml | 8 +------- src/org/waveprotocol/wave/client/editor/Editor.gwt.xml | 10 +++------- .../wave/client/testing/UndercurrentHarness.gwt.xml | 6 +++--- 4 files changed, 13 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/da1bdbe3/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 1b337ac..a6bd9c2 100644 --- a/build.xml +++ b/build.xml @@ -469,6 +469,8 @@ description="Runs the superdev mode, for debugging the GWT client in a browser."> <java failonerror="true" fork="true" classname="com.google.gwt.dev.codeserver.CodeServer"> <classpath> + <pathelement location="${lib.codegen}/gwt-dev-2.6.1.jar" /> + <pathelement location="${lib.codegen}/gwt-codeserver-2.6.1.jar" /> <pathelement location="${src.dir}"/> <pathelement location="${gen.dir}/messages"/> <path refid="libpath"/> @@ -497,6 +499,8 @@ <target name="editor-superdev" depends="compile" description="Runs the editor harness through the GWT superdev mode server, for debugging in a browser."> <java failonerror="true" fork="true" classname="com.google.gwt.dev.codeserver.CodeServer"> <classpath> + <pathelement location="${lib.codegen}/gwt-dev-2.6.1.jar" /> + <pathelement location="${lib.codegen}/gwt-codeserver-2.6.1.jar" /> <pathelement location="${src.dir}"/> <path refid="libpath"/> </classpath> @@ -524,6 +528,8 @@ <target name="waveharness-superdev" depends="compile" description="Runs the wave panel harness through the GWT superdev mode server, for debugging in a browser."> <java failonerror="true" fork="true" classname="com.google.gwt.dev.codeserver.CodeServer"> <classpath> + <pathelement location="${lib.codegen}/gwt-dev-2.6.1.jar" /> + <pathelement location="${lib.codegen}/gwt-codeserver-2.6.1.jar" /> <pathelement location="${src.dir}"/> <path refid="libpath"/> </classpath> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/da1bdbe3/src/org/waveprotocol/box/webclient/WebClientDev.gwt.xml ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/webclient/WebClientDev.gwt.xml b/src/org/waveprotocol/box/webclient/WebClientDev.gwt.xml index 9b02cdd..a0ac98a 100644 --- a/src/org/waveprotocol/box/webclient/WebClientDev.gwt.xml +++ b/src/org/waveprotocol/box/webclient/WebClientDev.gwt.xml @@ -37,14 +37,8 @@ <extend-property name="locale" values="en,ru"/> - <!-- Uncomment this when socket-io-java is replaced or patched with - https://github.com/vjrj/Socket.IO-Java/commit/f7010aee1f5cc5adea0aab3f27e48c37d1b10b5e - --> <!-- This linker is required for superdev mode --> - <!-- <add-linker name="xsiframe" /> --> - <!-- <set-configuration-property name="devModeRedirectEnabled" value="true"/> --> - <!-- enable source maps --> - <!-- <set-property name="compiler.useSourceMaps" value="true" /> --> + <add-linker name="xsiframe" /> <!-- collapse all properties to decrease the amount of time spend compiling --> <collapse-all-properties /> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/da1bdbe3/src/org/waveprotocol/wave/client/editor/Editor.gwt.xml ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/client/editor/Editor.gwt.xml b/src/org/waveprotocol/wave/client/editor/Editor.gwt.xml index 9eb40f0..24af85f 100644 --- a/src/org/waveprotocol/wave/client/editor/Editor.gwt.xml +++ b/src/org/waveprotocol/wave/client/editor/Editor.gwt.xml @@ -34,6 +34,8 @@ <inherits name="org.waveprotocol.wave.client.editor.selection.html.Html" /> <inherits name="org.waveprotocol.wave.client.scheduler.Scheduler" /> <inherits name="org.waveprotocol.wave.model.richtext.RichText" /> +<inherits name="com.google.common.collect.Collect"/> +<inherits name="org.waveprotocol.box.stat.Stat" /> <source path="" includes="*"/> <source path="content" includes="*"/> @@ -52,14 +54,8 @@ <source path="util"/> <source path="webdriver"/> - <!-- Uncomment this when socket-io-java is replaced or patched with - https://github.com/vjrj/Socket.IO-Java/commit/f7010aee1f5cc5adea0aab3f27e48c37d1b10b5e - --> <!-- This linker is required for superdev mode --> - <!-- <add-linker name="xsiframe" /> --> - <!-- <set-configuration-property name="devModeRedirectEnabled" value="true"/> --> - <!-- enable source maps --> - <!-- <set-property name="compiler.useSourceMaps" value="true" /> --> + <add-linker name="xsiframe" /> <!-- collapse all properties to decrease the amount of time spend compiling --> <collapse-all-properties /> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/da1bdbe3/src/org/waveprotocol/wave/client/testing/UndercurrentHarness.gwt.xml ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/client/testing/UndercurrentHarness.gwt.xml b/src/org/waveprotocol/wave/client/testing/UndercurrentHarness.gwt.xml index ed12256..c5d6167 100644 --- a/src/org/waveprotocol/wave/client/testing/UndercurrentHarness.gwt.xml +++ b/src/org/waveprotocol/wave/client/testing/UndercurrentHarness.gwt.xml @@ -27,6 +27,9 @@ <inherits name="org.waveprotocol.wave.model.conversation.Conversation" /> <inherits name="org.waveprotocol.wave.model.conversation.Testing" /> <inherits name="org.waveprotocol.wave.model.util.Util" /> + <inherits name="com.google.common.collect.Collect"/> + <inherits name="org.waveprotocol.box.stat.Stat" /> + <inherits name='org.waveprotocol.box.webclient.stat.Stat'/> <entry-point class="org.waveprotocol.wave.client.testing.UndercurrentHarness" /> <source path=""/> @@ -43,9 +46,6 @@ <!-- This linker is required for superdev mode --> <add-linker name="xsiframe" /> - <set-configuration-property name="devModeRedirectEnabled" value="true"/> - <!-- enable source maps --> - <set-property name="compiler.useSourceMaps" value="true" /> <!-- collapse all properties to decrease the amount of time spend compiling --> <collapse-all-properties />
