Modified: incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_es.properties URL: http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_es.properties?rev=1517927&r1=1517926&r2=1517927&view=diff ============================================================================== --- incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_es.properties (original) +++ incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_es.properties Tue Aug 27 19:14:34 2013 @@ -19,4 +19,4 @@ # # -address = Direcci??n: +address = Dirección:
Copied: incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_zh_TW.properties (from r1517915, incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_es.properties) URL: http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_zh_TW.properties?p2=incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_zh_TW.properties&p1=incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_es.properties&r1=1517915&r2=1517927&rev=1517927&view=diff ============================================================================== --- incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_es.properties (original) +++ incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_zh_TW.properties Tue Aug 27 19:14:34 2013 @@ -19,4 +19,4 @@ # # -address = Direcci??n: +address = å°å: Modified: incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/federation/FederationSettings.java URL: http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/federation/FederationSettings.java?rev=1517927&r1=1517926&r2=1517927&view=diff ============================================================================== --- incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/federation/FederationSettings.java (original) +++ incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/federation/FederationSettings.java Tue Aug 27 19:14:34 2013 @@ -31,7 +31,7 @@ public class FederationSettings { public static final String XMPP_SERVER_HOSTNAME = "xmpp_server_hostname"; public static final String XMPP_SERVER_SECRET = "xmpp_server_secret"; public static final String XMPP_COMPONENT_NAME = "xmpp_component_name"; - public static final String XMPP_SERVER_PORT = "xmpp_server_port"; + public static final String XMPP_SERVER_COMPONENT_PORT = "xmpp_server_component_port"; public static final String XMPP_SERVER_IP = "xmpp_server_ip"; public static final String XMPP_SERVER_DESCRIPTION = "xmpp_server_description"; public static final String XMPP_DISCO_FAILED_EXPIRY_SECS = "xmpp_disco_failed_expiry_secs"; @@ -51,7 +51,7 @@ public class FederationSettings { @Setting(name = XMPP_COMPONENT_NAME) private static String xmppComponentName; - @Setting(name = XMPP_SERVER_PORT) + @Setting(name = XMPP_SERVER_COMPONENT_PORT) private static int xmppServerPort; @Setting(name = XMPP_SERVER_IP) Modified: incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java URL: http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java?rev=1517927&r1=1517926&r2=1517927&view=diff ============================================================================== --- incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java (original) +++ incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java Tue Aug 27 19:14:34 2013 @@ -69,7 +69,7 @@ public class ComponentPacketTransport im @Named(FederationSettings.XMPP_SERVER_HOSTNAME) String serverDomain, @Named(FederationSettings.XMPP_SERVER_SECRET) String serverSecret, @Named(FederationSettings.XMPP_SERVER_IP) String serverAddress, - @Named(FederationSettings.XMPP_SERVER_PORT) int serverPort) { + @Named(FederationSettings.XMPP_SERVER_COMPONENT_PORT) int serverPort) { this.handler = handler; this.componentName = componentName; this.serverDomain = serverDomain; Modified: incubator/wave/branches/wave-0.4-release/test/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java URL: http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/test/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java?rev=1517927&r1=1517926&r2=1517927&view=diff ============================================================================== --- incubator/wave/branches/wave-0.4-release/test/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java (original) +++ incubator/wave/branches/wave-0.4-release/test/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java Tue Aug 27 19:14:34 2013 @@ -30,7 +30,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static org.waveprotocol.box.common.CommonConstants.INDEX_WAVE_ID; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -85,6 +84,7 @@ public class ClientFrontendImplTest exte new HashedVersionFactoryImpl(URI_CODEC); private static final WaveId WAVE_ID = WaveId.of("example.com", "waveId"); + private static final WaveId INDEX_WAVE_ID = WaveId.of("indexdomain", "indexwave"); private static final WaveletId W1 = WaveletId.of("example.com", IdConstants.CONVERSATION_ROOT_WAVELET); private static final WaveletId W2 = WaveletId.of("example.com", "conv+2"); Modified: incubator/wave/branches/wave-0.4-release/test/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java URL: http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/test/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java?rev=1517927&r1=1517926&r2=1517927&view=diff ============================================================================== --- incubator/wave/branches/wave-0.4-release/test/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java (original) +++ incubator/wave/branches/wave-0.4-release/test/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java Tue Aug 27 19:14:34 2013 @@ -49,7 +49,7 @@ import org.waveprotocol.wave.model.docum public class PasteFormatRendererGwtTest extends GWTTestCase { /** GWT version where invalid closing-br tags appear in innerHTML strings. */ - private final static String INVALID_BR_GWT_VERSION = "2.1.1"; + private final static String INVALID_BR_GWT_VERSION = "2.5.1"; @Override public String getModuleName() { Modified: incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/README.google URL: http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/README.google?rev=1517927&r1=1517926&r2=1517927&view=diff ============================================================================== --- incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/README.google (original) +++ incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/README.google Tue Aug 27 19:14:34 2013 @@ -1,5 +1,5 @@ URL: http://code.google.com/webtoolkit -Version: 2.1.1 +Version: 2.5.1 License: Apache 2.0 License File: COPYING Modified: incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/gwt-dev.jar URL: http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/gwt-dev.jar?rev=1517927&r1=1517926&r2=1517927&view=diff ============================================================================== Binary files - no diff available. Modified: incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/gwt-user.jar URL: http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/gwt-user.jar?rev=1517927&r1=1517926&r2=1517927&view=diff ============================================================================== Binary files - no diff available. Added: incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/validation-api-1.0.0.GA-sources.jar URL: http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/validation-api-1.0.0.GA-sources.jar?rev=1517927&view=auto ============================================================================== Files incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/validation-api-1.0.0.GA-sources.jar (added) and incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/validation-api-1.0.0.GA-sources.jar Tue Aug 27 19:14:34 2013 differ Added: incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/validation-api-1.0.0.GA.jar URL: http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/validation-api-1.0.0.GA.jar?rev=1517927&view=auto ============================================================================== Files incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/validation-api-1.0.0.GA.jar (added) and incubator/wave/branches/wave-0.4-release/third_party/codegen/gwt/validation-api-1.0.0.GA.jar Tue Aug 27 19:14:34 2013 differ
