Repository: incubator-wave Updated Branches: refs/heads/feature/WAVE-426-add-sbt d9cfad3e5 -> 335da1163
Fixing dependencies and resolving conflicts. Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/335da116 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/335da116 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/335da116 Branch: refs/heads/feature/WAVE-426-add-sbt Commit: 335da11633dbb760270f2cc2e90e38129f51b6a8 Parents: d9cfad3 Author: yuri.zelikov <[email protected]> Authored: Wed May 27 13:45:46 2015 +0300 Committer: yuri.zelikov <[email protected]> Committed: Wed May 27 13:45:46 2015 +0300 ---------------------------------------------------------------------- build.sbt | 4 ---- build.xml | 2 ++ .../box/server/rpc/ServerRpcProvider.java | 3 +-- .../server/waveserver/SolrSearchProviderImpl.java | 2 +- .../box/server/waveserver/SolrWaveIndexerImpl.java | 2 +- .../MemoryPerUserWaveViewProviderTest.java | 2 +- .../view/dom/full/UiBuilderTestHelper.java | 16 ++++++---------- 7 files changed, 12 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/335da116/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index 3921cb5..c3576ab 100644 --- a/build.sbt +++ b/build.sbt @@ -20,16 +20,12 @@ unmanagedSourceDirectories in Compile += baseDirectory.value / "gen" / "gxp" unmanagedSourceDirectories in Compile += baseDirectory.value / "gen" / "messages" -unmanagedSourceDirectories in Compile += baseDirectory.value / "gen" / "messages" - - unmanagedJars in Compile := (baseDirectory.value / "third_party" / "runtime" ** "*.jar").classpath unmanagedJars in Compile ++= (baseDirectory.value / "third_party" / "test" ** "*.jar").classpath unmanagedJars in Compile ++= (baseDirectory.value / "third_party" / "codegen" ** "*.jar").classpath - libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test" mainClass in (Compile, run) := Some("org.waveprotocol.box.server.ServerMain") http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/335da116/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index eaedda6..683d992 100644 --- a/build.xml +++ b/build.xml @@ -1015,6 +1015,7 @@ <url url="https://archive.apache.org/dist/commons/fileupload/source/commons-fileupload-1.2.2-src.zip"; /> <url url="http://central.maven.org/maven2/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"; /> <url url="http://central.maven.org/maven2/commons-codec/commons-codec/1.4/commons-codec-1.4.jar"; /> + <url url="http://central.maven.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.jar"; /> <url url="https://archive.apache.org/dist/commons/codec/source/commons-codec-1.4-src.zip"; /> <url url="http://central.maven.org/maven2/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"; /> <url url="http://central.maven.org/maven2/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar"; /> @@ -1053,6 +1054,7 @@ <url url="http://archiva.comunes.org/repository/comunes-snapshots/cc/kune/gwt-initials-avatars-shared/1.0-SNAPSHOT/gwt-initials-avatars-shared-1.0-20140324.102812-16-sources.jar"; /> <url url="http://archiva.comunes.org/repository/comunes-snapshots/cc/kune/gwt-initials-avatars-server/1.0-SNAPSHOT/gwt-initials-avatars-server-1.0-20140324.102825-10.jar"; /> <url url="http://central.maven.org/maven2/com/typesafe/config/1.2.1/config-1.2.1.jar"; /> + <url url="http://central.maven.org/maven2/xerces/xerces/2.4.0/xerces-2.4.0.jar"; /> </get> <get dest="${lib.runtime}/whack_1_0_0.zip" usetimestamp="true" skipexisting="true"> <url url="http://www.igniterealtime.org/downloadServlet?filename=whack/whack_1_0_0.zip"; /> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/335da116/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java index 9beb2b5..d331395 100755 --- a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java +++ b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java @@ -44,7 +44,6 @@ import org.atmosphere.util.IOUtils; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.server.session.HashSessionManager; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletHolder; @@ -482,7 +481,7 @@ public class ServerRpcProvider { } /** - * @return a list of {@link SelectChannelConnector} each bound to a host:port + * @return a list of {@link Connector} each bound to a host:port * pair form the list addresses. */ private List<Connector> getSelectChannelConnectors( http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/335da116/src/org/waveprotocol/box/server/waveserver/SolrSearchProviderImpl.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/waveserver/SolrSearchProviderImpl.java b/src/org/waveprotocol/box/server/waveserver/SolrSearchProviderImpl.java index 66ff288..9a3e1c9 100644 --- a/src/org/waveprotocol/box/server/waveserver/SolrSearchProviderImpl.java +++ b/src/org/waveprotocol/box/server/waveserver/SolrSearchProviderImpl.java @@ -30,9 +30,9 @@ import com.google.inject.Inject; import com.google.wave.api.SearchResult; import com.typesafe.config.Config; import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.URI; import org.apache.commons.httpclient.methods.GetMethod; -import org.apache.http.HttpStatus; import org.waveprotocol.box.stat.Timed; import org.waveprotocol.wave.model.id.WaveId; import org.waveprotocol.wave.model.id.WaveletId; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/335da116/src/org/waveprotocol/box/server/waveserver/SolrWaveIndexerImpl.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/waveserver/SolrWaveIndexerImpl.java b/src/org/waveprotocol/box/server/waveserver/SolrWaveIndexerImpl.java index 2af772a..d4583f5 100644 --- a/src/org/waveprotocol/box/server/waveserver/SolrWaveIndexerImpl.java +++ b/src/org/waveprotocol/box/server/waveserver/SolrWaveIndexerImpl.java @@ -31,12 +31,12 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.typesafe.config.Config; import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.URI; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.RequestEntity; import org.apache.commons.httpclient.methods.StringRequestEntity; -import org.apache.http.HttpStatus; import org.waveprotocol.box.common.DeltaSequence; import org.waveprotocol.box.common.Snippets; import org.waveprotocol.box.server.executor.ExecutorAnnotations.SolrExecutor; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/335da116/test/org/waveprotocol/box/server/waveserver/MemoryPerUserWaveViewProviderTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/box/server/waveserver/MemoryPerUserWaveViewProviderTest.java b/test/org/waveprotocol/box/server/waveserver/MemoryPerUserWaveViewProviderTest.java index 89006a4..2920060 100644 --- a/test/org/waveprotocol/box/server/waveserver/MemoryPerUserWaveViewProviderTest.java +++ b/test/org/waveprotocol/box/server/waveserver/MemoryPerUserWaveViewProviderTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; import com.google.common.util.concurrent.SettableFuture; -import com.google.gwt.thirdparty.guava.common.collect.Maps; import org.mockito.Mock; import org.waveprotocol.wave.model.id.WaveId; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/335da116/test/org/waveprotocol/wave/client/wavepanel/view/dom/full/UiBuilderTestHelper.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/client/wavepanel/view/dom/full/UiBuilderTestHelper.java b/test/org/waveprotocol/wave/client/wavepanel/view/dom/full/UiBuilderTestHelper.java index a5b42bd..3f5242c 100644 --- a/test/org/waveprotocol/wave/client/wavepanel/view/dom/full/UiBuilderTestHelper.java +++ b/test/org/waveprotocol/wave/client/wavepanel/view/dom/full/UiBuilderTestHelper.java @@ -19,14 +19,7 @@ package org.waveprotocol.wave.client.wavepanel.view.dom.full; -import org.waveprotocol.wave.client.wavepanel.view.dom.full.i18n.ReplyBoxMessages; -import org.waveprotocol.wave.client.wavepanel.view.dom.full.i18n.BlipMessages; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.fail; - import com.google.gwt.resources.client.CssResource; - import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; @@ -37,11 +30,16 @@ import org.waveprotocol.wave.client.common.safehtml.SafeHtmlBuilder; import org.waveprotocol.wave.client.uibuilder.BuilderHelper.Component; import org.waveprotocol.wave.client.uibuilder.HtmlClosure; import org.waveprotocol.wave.client.uibuilder.UiBuilder; +import org.waveprotocol.wave.client.wavepanel.view.dom.full.i18n.BlipMessages; +import org.waveprotocol.wave.client.wavepanel.view.dom.full.i18n.ReplyBoxMessages; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; @@ -49,9 +47,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; +import static junit.framework.Assert.*; /** * Utility function for testing ui builder implementation.
