http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/i18n/ReplyBoxMessages_zh_TW.properties ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/i18n/ReplyBoxMessages_zh_TW.properties b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/i18n/ReplyBoxMessages_zh_TW.properties new file mode 100644 index 0000000..ec20d3e --- /dev/null +++ b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/i18n/ReplyBoxMessages_zh_TW.properties @@ -0,0 +1,22 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + +clickHereToReply = æé裡åè¦
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_de.properties ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_de.properties b/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_de.properties new file mode 100644 index 0000000..cee3d69 --- /dev/null +++ b/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_de.properties @@ -0,0 +1,22 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + +address = Adresse: http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_es.properties ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_es.properties b/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_es.properties index 48ad803..e094989 100644 --- a/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_es.properties +++ b/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_es.properties @@ -19,4 +19,4 @@ # # -address = Direcci??n: +address = Dirección: http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_zh_TW.properties ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_zh_TW.properties b/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_zh_TW.properties new file mode 100644 index 0000000..56e3f1a --- /dev/null +++ b/src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_zh_TW.properties @@ -0,0 +1,22 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + +address = å°å: http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/src/org/waveprotocol/wave/federation/FederationSettings.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/federation/FederationSettings.java b/src/org/waveprotocol/wave/federation/FederationSettings.java index 6aad16d..bad3199 100644 --- a/src/org/waveprotocol/wave/federation/FederationSettings.java +++ b/src/org/waveprotocol/wave/federation/FederationSettings.java @@ -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) http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java b/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java index e5cccdd..bd7b06d 100644 --- a/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java +++ b/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java @@ -69,7 +69,7 @@ public class ComponentPacketTransport implements Component, OutgoingPacketTransp @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; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/src/org/waveprotocol/wave/migration/build.xml ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/migration/build.xml b/src/org/waveprotocol/wave/migration/build.xml deleted file mode 100644 index f9d8ebf..0000000 --- a/src/org/waveprotocol/wave/migration/build.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version='1.0'?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> - -<!-- -Copyright (C) 2010 Google Inc. -See COPYING for license. ---> -<project name="migration"> - <import file="${build.common.path}"/> - <property name="libname" value="migration"/> - <patternset id="srcs"> - <include name="org/waveprotocol/wave/migration/**"/> - </patternset> -</project> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/src/org/waveprotocol/wave/migration/helpers/FixLinkAnnotationsFilter.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/migration/helpers/FixLinkAnnotationsFilter.java b/src/org/waveprotocol/wave/migration/helpers/FixLinkAnnotationsFilter.java deleted file mode 100644 index 4f135cb..0000000 --- a/src/org/waveprotocol/wave/migration/helpers/FixLinkAnnotationsFilter.java +++ /dev/null @@ -1,166 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.waveprotocol.wave.migration.helpers; - -import org.waveprotocol.wave.client.common.util.WaveRefConstants; -import org.waveprotocol.wave.model.document.operation.Nindo.NindoCursor; -import org.waveprotocol.wave.model.document.operation.NindoCursorDecorator; -import org.waveprotocol.wave.model.id.InvalidIdException; -import org.waveprotocol.wave.model.id.WaveId; -import org.waveprotocol.wave.model.waveref.InvalidWaveRefException; -import org.waveprotocol.wave.model.waveref.WaveRef; -import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; - -/** - * Renames both "link/manual" and "link/wave" annotations to just "link". - * - * In cases where they would conflict, link/manual's value wins. Also, - * link/wave's wave id is converted to a wave://waveref URI format. - * - * Also, replaces all instances of "waveid://" with simply "wave://", - * and fixes waveids to be wave refs. This also applies to link/auto: - * it is not renamed, but its values are still normalized. - * - * @author [email protected] (Daniel Danilatos) - */ -public class FixLinkAnnotationsFilter extends NindoCursorDecorator { - - static final String OLD_MANUAL = "link/manual"; - static final String OLD_WAVE = "link/wave"; - static final String AUTO = "link/auto"; - static final String NEW = "link"; - static final String OLD_PREFIX = "waveid://"; - - private boolean manualOpen; - private boolean waveOpen; - private String currentManual; - private String currentWave; - - public FixLinkAnnotationsFilter(NindoCursor target) { - super(target); - } - - @Override - public void begin() { - currentManual = null; - currentWave = null; - manualOpen = false; - waveOpen = false; - target.begin(); - } - - @Override - public void finish() { - target.finish(); - assert currentManual == null; - assert currentWave == null; - assert manualOpen == false; - assert waveOpen == false; - } - - @Override - public void startAnnotation(String key, String value) { - if (OLD_MANUAL.equals(key)) { - manualOpen = true; - currentManual = normalize(value); - startLink(); - } else if (OLD_WAVE.equals(key)) { - try { - currentWave = linkValueFromWaveValue(value); - } catch (InvalidWaveRefException e) { - // Discard invalid links. - closeWave(); - return; - } - waveOpen = true; - if (!manualOpen) { - startLink(); - } - } else if (AUTO.equals(key)) { - super.startAnnotation(key, normalize(value)); - } else { - super.startAnnotation(key, value); - } - } - - @Override - public void endAnnotation(String key) { - if (OLD_MANUAL.equals(key)) { - manualOpen = false; - currentManual = null; - if (waveOpen) { - startLink(); - } else { - endLink(); - } - } else if (OLD_WAVE.equals(key)) { - closeWave(); - } else { - super.endAnnotation(key); - } - } - - void closeWave() { - if (waveOpen) { - waveOpen = false; - currentWave = null; - if (!manualOpen) { - endLink(); - } - } - } - - void startLink() { - assert manualOpen || waveOpen; - super.startAnnotation(NEW, manualOpen ? currentManual : currentWave); - } - - void endLink() { - assert !manualOpen && !waveOpen && (currentManual == null) && (currentWave == null); - super.endAnnotation(NEW); - } - - public static String normalize(String oldHref) { - if (oldHref != null && oldHref.startsWith(OLD_PREFIX)) { - try { - return linkValueFromWaveValue(oldHref.substring(OLD_PREFIX.length())); - } catch (InvalidWaveRefException e) { - return null; - } - } else { - return oldHref; - } - } - - public static String linkValueFromWaveValue(String rawString) throws InvalidWaveRefException { - if (rawString == null) { - return null; - } - WaveRef ref; - try { - ref = WaveRef.of(WaveId.checkedDeserialise(rawString)); - } catch (InvalidIdException e) { - // Let's try decoding it as a wave ref instead - ref = JavaWaverefEncoder.decodeWaveRefFromPath(rawString); - } - - return WaveRefConstants.WAVE_URI_PREFIX + JavaWaverefEncoder.encodeToUriPathSegment(ref); - } -} http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/src/org/waveprotocol/wave/migration/helpers/StripWColonFilter.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/migration/helpers/StripWColonFilter.java b/src/org/waveprotocol/wave/migration/helpers/StripWColonFilter.java deleted file mode 100644 index 43b823b..0000000 --- a/src/org/waveprotocol/wave/migration/helpers/StripWColonFilter.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.waveprotocol.wave.migration.helpers; - -import org.waveprotocol.wave.model.document.operation.Attributes; -import org.waveprotocol.wave.model.document.operation.DocOpCursor; -import org.waveprotocol.wave.model.document.operation.DocOpCursorDecorator; - -/** - * Strips the "w:" prefix from elements. - * - * @author [email protected] (Daniel Danilatos) - */ -public class StripWColonFilter extends DocOpCursorDecorator { - - public StripWColonFilter(DocOpCursor target) { - super(target); - } - - @Override - public void elementStart(String type, Attributes attrs) { - super.elementStart(strip(type), attrs); - } - - @Override - public void deleteElementStart(String type, Attributes attrs) { - super.deleteElementStart(strip(type), attrs); - } - - private String strip(String type) { - return type.startsWith("w:") ? type.substring(2) : type; - } -} http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/test/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java b/test/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java index 7d2e8c6..8a3f1d6 100644 --- a/test/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java +++ b/test/org/waveprotocol/box/server/frontend/ClientFrontendImplTest.java @@ -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 extends TestCase { 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"); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/test/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java b/test/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java index 8f061f9..83d34c3 100644 --- a/test/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java +++ b/test/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java @@ -49,7 +49,7 @@ import org.waveprotocol.wave.model.document.util.XmlStringBuilder; 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() { http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/test/org/waveprotocol/wave/migration/helpers/FixLinkAnnotationsFilterTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/migration/helpers/FixLinkAnnotationsFilterTest.java b/test/org/waveprotocol/wave/migration/helpers/FixLinkAnnotationsFilterTest.java deleted file mode 100644 index 7819ae8..0000000 --- a/test/org/waveprotocol/wave/migration/helpers/FixLinkAnnotationsFilterTest.java +++ /dev/null @@ -1,253 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.waveprotocol.wave.migration.helpers; - -import static org.waveprotocol.wave.migration.helpers.FixLinkAnnotationsFilter.AUTO; -import static org.waveprotocol.wave.migration.helpers.FixLinkAnnotationsFilter.NEW; -import static org.waveprotocol.wave.migration.helpers.FixLinkAnnotationsFilter.OLD_MANUAL; -import static org.waveprotocol.wave.migration.helpers.FixLinkAnnotationsFilter.OLD_WAVE; - -import junit.framework.TestCase; - -import org.waveprotocol.wave.model.document.indexed.IndexedDocument; -import org.waveprotocol.wave.model.document.operation.Nindo; -import org.waveprotocol.wave.model.document.operation.impl.DocOpUtil; -import org.waveprotocol.wave.model.document.raw.impl.Element; -import org.waveprotocol.wave.model.document.raw.impl.Node; -import org.waveprotocol.wave.model.document.raw.impl.Text; -import org.waveprotocol.wave.model.document.util.DocProviders; -import org.waveprotocol.wave.model.operation.OperationException; - -/** - * @author [email protected] (Daniel Danilatos) - */ -public class FixLinkAnnotationsFilterTest extends TestCase { - IndexedDocument<Node, Element, Text> doc = DocProviders.POJO.parse("12345678901234567890"); - IndexedDocument<Node, Element, Text> checkDoc = DocProviders.POJO.parse("12345678901234567890"); - String waveid = "example.com!foobar"; - String waveref = "example.com/foobar"; - String webHref = "http://example.com";; - String waveHref = "wave://example.com/foobar"; - Nindo.Builder fb; - FixLinkAnnotationsFilter f; - Nindo.Builder cb; - - @Override - protected void setUp() { - newBuilders(); - } - - public void testRenamesLinkManual() throws OperationException { - f.skip(1); - f.startAnnotation(OLD_MANUAL, webHref); - f.skip(2); - f.endAnnotation(OLD_MANUAL); - - cb.skip(1); - cb.startAnnotation(NEW, webHref); - cb.skip(2); - cb.endAnnotation(NEW); - - checkEqual(); - } - - public void testReplacesLinkWave() throws OperationException { - f.skip(1); - f.startAnnotation(OLD_WAVE, waveid); - f.skip(2); - f.endAnnotation(OLD_WAVE); - - cb.skip(1); - cb.startAnnotation(NEW, waveHref); - cb.skip(2); - cb.endAnnotation(NEW); - - checkEqual(); - } - - public void testReplacesLinkWaveContainingWaveref() throws OperationException { - f.skip(1); - f.startAnnotation(OLD_WAVE, waveref); - f.skip(2); - f.endAnnotation(OLD_WAVE); - - cb.skip(1); - cb.startAnnotation(NEW, waveHref); - cb.skip(2); - cb.endAnnotation(NEW); - - checkEqual(); - } - - public void testManualLinkWinsWhenStacked() throws OperationException { - f.skip(1); - f.startAnnotation(OLD_WAVE, waveid); - f.startAnnotation(OLD_MANUAL, webHref); - f.skip(2); - f.endAnnotation(OLD_WAVE); - f.endAnnotation(OLD_MANUAL); - f.skip(1); - // Now in the other order - f.startAnnotation(OLD_MANUAL, webHref); - f.startAnnotation(OLD_WAVE, waveid); - f.skip(2); - f.endAnnotation(OLD_MANUAL); - f.endAnnotation(OLD_WAVE); - - cb.skip(1); - cb.startAnnotation(NEW, webHref); - cb.skip(2); - cb.endAnnotation(NEW); - cb.skip(1); - cb.startAnnotation(NEW, webHref); - cb.skip(2); - cb.endAnnotation(NEW); - - checkEqual(); - } - - public void testManualLinkWinsWhenOverlapping() throws OperationException { - f.skip(1); - f.startAnnotation(OLD_WAVE, waveid); - f.skip(1); - f.startAnnotation(OLD_MANUAL, webHref); - f.skip(1); - f.endAnnotation(OLD_WAVE); - f.skip(1); - f.endAnnotation(OLD_MANUAL); - - cb.skip(1); - cb.startAnnotation(NEW, waveHref); - cb.skip(1); - cb.startAnnotation(NEW, webHref); - cb.skip(2); - cb.endAnnotation(NEW); - - checkEqual(); - - - newBuilders(); - - f.skip(1); - f.startAnnotation(OLD_MANUAL, webHref); - f.skip(1); - f.startAnnotation(OLD_WAVE, waveid); - f.skip(1); - f.endAnnotation(OLD_MANUAL); - f.skip(1); - f.endAnnotation(OLD_WAVE); - - cb.skip(1); - cb.startAnnotation(NEW, webHref); - cb.skip(2); - cb.startAnnotation(NEW, waveHref); - cb.skip(1); - cb.endAnnotation(NEW); - - checkEqual(); - - - newBuilders(); - - f.startAnnotation(OLD_MANUAL, webHref); - f.skip(1); - f.endAnnotation(OLD_MANUAL); - f.startAnnotation(OLD_WAVE, waveid); - f.skip(1); - f.endAnnotation(OLD_WAVE); - f.startAnnotation(OLD_MANUAL, webHref); - f.skip(1); - f.startAnnotation(OLD_WAVE, waveid); - f.endAnnotation(OLD_MANUAL); - f.skip(1); - f.startAnnotation(OLD_MANUAL, webHref); - f.endAnnotation(OLD_WAVE); - f.skip(1); - f.endAnnotation(OLD_MANUAL); - - cb.startAnnotation(NEW, webHref); - cb.skip(1); - cb.startAnnotation(NEW, waveHref); - cb.skip(1); - cb.startAnnotation(NEW, webHref); - cb.skip(1); - cb.startAnnotation(NEW, waveHref); - cb.skip(1); - cb.startAnnotation(NEW, webHref); - cb.skip(1); - cb.endAnnotation(NEW); - - checkEqual(); - } - - public void testNormalizesValues() throws OperationException { - f.skip(1); - f.startAnnotation(OLD_MANUAL, "waveid://" + waveid); - f.skip(2); - f.endAnnotation(OLD_MANUAL); - f.skip(1); - f.startAnnotation(AUTO, "waveid://" + waveid); - f.skip(2); - f.endAnnotation(AUTO); - - cb.skip(1); - cb.startAnnotation(NEW, waveHref); - cb.skip(2); - cb.endAnnotation(NEW); - cb.skip(1); - cb.startAnnotation(AUTO, waveHref); - cb.skip(2); - cb.endAnnotation(AUTO); - - checkEqual(); - } - - public void testIgnoresOtherAnnotations() throws OperationException { - f.skip(1); - f.startAnnotation("foo", "bar"); - f.skip(2); - f.endAnnotation("foo"); - - cb.skip(1); - cb.startAnnotation("foo", "bar"); - cb.skip(2); - cb.endAnnotation("foo"); - - checkEqual(); - } - - void newBuilders() { - fb = Nindo.builder(); - f = new FixLinkAnnotationsFilter(fb); - cb = Nindo.builder(); - f.begin(); - cb.begin(); - } - - void checkEqual() throws OperationException { - cb.finish(); - f.finish(); - Nindo filteredNindo = fb.build(); - checkDoc.consumeAndReturnInvertible(cb.build()); - doc.consumeAndReturnInvertible(filteredNindo); - assertEquals(DocOpUtil.toXmlString(checkDoc.asOperation()), - DocOpUtil.toXmlString(doc.asOperation())); - } -} http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/third_party/codegen/gwt/README.google ---------------------------------------------------------------------- diff --git a/third_party/codegen/gwt/README.google b/third_party/codegen/gwt/README.google index 0a4328d..b9eb555 100644 --- a/third_party/codegen/gwt/README.google +++ b/third_party/codegen/gwt/README.google @@ -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 http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/third_party/codegen/gwt/gwt-dev.jar ---------------------------------------------------------------------- diff --git a/third_party/codegen/gwt/gwt-dev.jar b/third_party/codegen/gwt/gwt-dev.jar index 957c8ca..9eac248 100644 Binary files a/third_party/codegen/gwt/gwt-dev.jar and b/third_party/codegen/gwt/gwt-dev.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/third_party/codegen/gwt/gwt-user.jar ---------------------------------------------------------------------- diff --git a/third_party/codegen/gwt/gwt-user.jar b/third_party/codegen/gwt/gwt-user.jar index bfef250..23e450f 100644 Binary files a/third_party/codegen/gwt/gwt-user.jar and b/third_party/codegen/gwt/gwt-user.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/third_party/codegen/gwt/validation-api-1.0.0.GA-sources.jar ---------------------------------------------------------------------- diff --git a/third_party/codegen/gwt/validation-api-1.0.0.GA-sources.jar b/third_party/codegen/gwt/validation-api-1.0.0.GA-sources.jar new file mode 100644 index 0000000..43611a2 Binary files /dev/null and b/third_party/codegen/gwt/validation-api-1.0.0.GA-sources.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/third_party/codegen/gwt/validation-api-1.0.0.GA.jar ---------------------------------------------------------------------- diff --git a/third_party/codegen/gwt/validation-api-1.0.0.GA.jar b/third_party/codegen/gwt/validation-api-1.0.0.GA.jar new file mode 100644 index 0000000..1ff2dd7 Binary files /dev/null and b/third_party/codegen/gwt/validation-api-1.0.0.GA.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/third_party/runtime/jackson/COPYING ---------------------------------------------------------------------- diff --git a/third_party/runtime/jackson/COPYING b/third_party/runtime/jackson/COPYING deleted file mode 100644 index d645695..0000000 --- a/third_party/runtime/jackson/COPYING +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/third_party/runtime/jackson/README.google ---------------------------------------------------------------------- diff --git a/third_party/runtime/jackson/README.google b/third_party/runtime/jackson/README.google deleted file mode 100644 index 6f308e8..0000000 --- a/third_party/runtime/jackson/README.google +++ /dev/null @@ -1,12 +0,0 @@ -URL: http://jackson.codehaus.org/ -Version: 1.5.2 -License: Apache 2.0 - -License File: COPYING - -Description: -A library for encoding and decoding JSON in Java. - -Local Modifications: -None. - http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7f56462b/third_party/runtime/jackson/jackson-core-asl-1.5.2.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jackson/jackson-core-asl-1.5.2.jar b/third_party/runtime/jackson/jackson-core-asl-1.5.2.jar deleted file mode 100644 index 24107e6..0000000 Binary files a/third_party/runtime/jackson/jackson-core-asl-1.5.2.jar and /dev/null differ
