- kune-commits - lists.ourproject.org

[kune issues] #279: Chat should permit to add newlines
by kune issues 30 May '12

30 May '12

#279: Chat should permit to add newlines --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: Chat | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ Older versions of emite permitted that via Ctrl+Return or similar. -- Ticket URL: <http://kune.ourproject.org/issues/ticket/279> kune issues <http://kune.ourproject.org/issues/>

1 0

r1877 - in trunk/src/main/java/cc/kune: core/client/sn/actions gspace/client/viewers wave/client
by Vicente J. Ruiz Jurado 30 May '12

30 May '12

Author: vjrj_ Date: 2012-05-30 12:46:29 +0200 (Wed, 30 May 2012) New Revision: 1877 Added: trunk/src/main/java/cc/kune/wave/client/WaveUnsavedIndicator.java Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/SessionAction.java trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java trunk/src/main/java/cc/kune/wave/client/WebClient.java Log: CLOSED - # 278: Implements a custom UnsavedDataListener http://kune.ourproject.org/issues/ticket/278 Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/SessionAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/SessionAction.java 2012-05-24 13:19:59 UTC (rev 1876) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/SessionAction.java 2012-05-30 10:46:29 UTC (rev 1877) @@ -27,9 +27,22 @@ import com.google.inject.Inject; +/** + * The Class SessionAction is used to create actions that depends of current + * session auth status + */ public abstract class SessionAction extends AbstractExtendedAction { + protected final Session session; + /** + * Instantiates a new session action. + * + * @param session + * the kune session + * @param authNeed + * if user authentication is needed + */ @Inject public SessionAction(final Session session, final boolean authNeed) { this.session = session; @@ -42,6 +55,14 @@ }); } + /** + * Refresh status. + * + * @param authNeed + * the auth need + * @param isLogged + * the is logged + */ public void refreshStatus(final boolean authNeed, final boolean isLogged) { boolean visible = false; final boolean noLogged = !isLogged; @@ -54,6 +75,12 @@ setVisible(visible); } + /** + * Sets the visible. + * + * @param visible + * the new visible + */ public void setVisible(final boolean visible) { setEnabled(visible); putValue(GuiActionDescrip.VISIBLE, visible); Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java 2012-05-24 13:19:59 UTC (rev 1876) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java 2012-05-30 10:46:29 UTC (rev 1877) @@ -48,6 +48,7 @@ import cc.kune.wave.client.WaveClientProvider; import cc.kune.wave.client.WaveClientUtils; import cc.kune.wave.client.WaveClientView; +import cc.kune.wave.client.WaveUnsavedIndicator; import cc.kune.wave.client.WebClientMock; import com.google.gwt.core.client.GWT; @@ -80,12 +81,14 @@ @UiField DeckPanel deck; private final ContentDropController dropController; + private FramedPanel dummyWaveFrame; private final GSpaceArmor gsArmor; private final I18nTranslationService i18n; private IdGenerator idGenerator; private Element loading; @UiField InlineHTML onlyViewPanel; + private ProfileManager profiles; private final StateManager stateManager; @@ -94,27 +97,28 @@ private KuneStagesProvider wave; private final WaveClientProvider waveClientProv; - private ImplPanel waveHolder; @UiField ImplPanel waveHolderParent; + private final WaveStore waveStore = new SimpleWaveStore(); + private final WaveUnsavedIndicator waveUnsavedIndicator; + private final Widget widget; - private FramedPanel dummyWaveFrame; - @Inject public ContentViewerPanel(final GSpaceArmor wsArmor, final WaveClientProvider waveClient, final ContentCapabilitiesRegistry capabilitiesRegistry, final I18nTranslationService i18n, final EventBus eventBus, final StateManager stateManager, - final ContentDropController dropController) { + final ContentDropController dropController, final WaveUnsavedIndicator waveUnsavedIndicator) { this.gsArmor = wsArmor; this.waveClientProv = waveClient; this.capabilitiesRegistry = capabilitiesRegistry; this.i18n = i18n; this.stateManager = stateManager; this.dropController = dropController; + this.waveUnsavedIndicator = waveUnsavedIndicator; widget = uiBinder.createAndBindUi(this); contentTitle = new ContentTitleWidget(i18n, gsArmor, capabilitiesRegistry.getIconsRegistry()); eventBus.addHandler(WaveClientClearEvent.getType(), @@ -228,9 +232,10 @@ // UIObject.setVisible(waveFrame.getElement(), true); waveHolder.getElement().appendChild(loading); final Element holder = waveHolder.getElement().appendChild(Document.get().createDivElement()); - final KuneStagesProvider wave = new KuneStagesProvider(holder, (com.google.gwt.dom.client.Element) new Label().getElement(), waveHolder, dummyWaveFrame, waveRef, channel, - idGenerator, profiles, waveStore, isNewWave, - org.waveprotocol.box.webclient.client.Session.get().getDomain(), true, i18n); + final KuneStagesProvider wave = new KuneStagesProvider(holder, new Label().getElement(), + waveHolder, dummyWaveFrame, waveRef, channel, idGenerator, profiles, waveStore, isNewWave, + org.waveprotocol.box.webclient.client.Session.get().getDomain(), true, i18n, + waveUnsavedIndicator); this.wave = wave; wave.load(new Command() { @Override Modified: trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java 2012-05-24 13:19:59 UTC (rev 1876) +++ trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java 2012-05-30 10:46:29 UTC (rev 1877) @@ -19,7 +19,6 @@ package cc.kune.wave.client; import org.waveprotocol.box.webclient.client.RemoteViewServiceMultiplexer; -import org.waveprotocol.box.webclient.client.SavedStateIndicator; import org.waveprotocol.box.webclient.client.StageTwoProvider; import org.waveprotocol.box.webclient.client.WindowTitleHandler; import org.waveprotocol.box.webclient.search.WaveContext; @@ -73,31 +72,46 @@ private final static AsyncHolder<Object> HALT = new AsyncHolder<Object>() { @Override - public void call(Accessor<Object> accessor) { + public void call(final Accessor<Object> accessor) { // Never ready, so never notify the accessor. } }; - private final Element wavePanelElement; - private final Element unsavedIndicatorElement; - private final FramedPanel waveFrame; - private final LogicalPanel rootPanel; - private final WaveRef waveRef; + /** + * Finds the blip that should receive the focus and selects it. + */ + private static void selectAndFocusOnBlip(final Reader reader, final ModelAsViewProvider views, + final ConversationView wave, final FocusFramePresenter focusFrame, final WaveRef waveRef) { + final FocusBlipSelector blipSelector = + FocusBlipSelector.create(wave, views, reader, new ViewTraverser()); + final BlipView blipUi = blipSelector.selectBlipByWaveRef(waveRef); + // Focus on the selected blip. + if (blipUi != null) { + focusFrame.focus(blipUi); + } + } private final RemoteViewServiceMultiplexer channel; + private boolean closed; + private final I18nTranslationService i18n; private final IdGenerator idGenerator; - private final ProfileManager profiles; - private final WaveStore waveStore; private final boolean isNewWave; private final String localDomain; + private StageOne one; + private final ProfileManager profiles; + private final LogicalPanel rootPanel; + private final boolean showParticipantsPanel; - private boolean closed; - private StageOne one; + private StageThree three; private StageTwo two; - private StageThree three; + private final Element unsavedIndicatorElement; private WaveContext wave; - private final boolean showParticipantsPanel; - private final I18nTranslationService i18n; + private final FramedPanel waveFrame; + private final Element wavePanelElement; + private final WaveRef waveRef; + private final WaveStore waveStore; + private final WaveUnsavedIndicator waveUnsavedIndicator; + /** * @param wavePanelElement the DOM element to become the wave panel. * @param unsavedIndicatorElement the element that displays the wave saved state. @@ -110,10 +124,10 @@ * @param isNewWave true if the wave is a new client-created wave * @param idGenerator */ - public KuneStagesProvider(Element wavePanelElement, Element unsavedIndicatorElement, - LogicalPanel rootPanel, FramedPanel waveFrame, WaveRef waveRef, RemoteViewServiceMultiplexer channel, - IdGenerator idGenerator, ProfileManager profiles, WaveStore store, boolean isNewWave, - String localDomain, boolean showParticipantsPanel, I18nTranslationService i18n) { + public KuneStagesProvider(final Element wavePanelElement, final Element unsavedIndicatorElement, + final LogicalPanel rootPanel, final FramedPanel waveFrame, final WaveRef waveRef, final RemoteViewServiceMultiplexer channel, + final IdGenerator idGenerator, final ProfileManager profiles, final WaveStore store, final boolean isNewWave, + final String localDomain, final boolean showParticipantsPanel, final I18nTranslationService i18n, final WaveUnsavedIndicator waveUnsavedIndicator) { this.wavePanelElement = wavePanelElement; this.unsavedIndicatorElement = unsavedIndicatorElement; this.waveFrame = waveFrame; @@ -127,49 +141,25 @@ this.localDomain = localDomain; this.showParticipantsPanel = showParticipantsPanel; this.i18n = i18n; + this.waveUnsavedIndicator = waveUnsavedIndicator; } @Override - protected AsyncHolder<StageZero> createStageZeroLoader() { - return haltIfClosed(super.createStageZeroLoader()); - } - - @Override - protected AsyncHolder<StageOne> createStageOneLoader(StageZero zero) { + protected AsyncHolder<StageOne> createStageOneLoader(final StageZero zero) { return haltIfClosed(new StageOne.DefaultProvider(zero) { @Override - protected Element createWaveHolder() { - return wavePanelElement; + protected LogicalPanel createWaveContainer() { + return rootPanel; } @Override - protected LogicalPanel createWaveContainer() { - return rootPanel; + protected Element createWaveHolder() { + return wavePanelElement; } }); } @Override - protected AsyncHolder<StageTwo> createStageTwoLoader(StageOne one) { - return haltIfClosed(new StageTwoProvider(this.one = one, waveRef, channel, isNewWave, - idGenerator, profiles, new SavedStateIndicator(unsavedIndicatorElement)) { - // Kune patch - @Override - protected DomRenderer createRenderer() { - return KuneFullDomWaveRendererImpl.create(getConversations(), getProfileManager(), - getBlipDetailer(), getViewIdMapper(), getBlipQueue(), getThreadReadStateMonitor(), - createViewFactories(), showParticipantsPanel); - - // Warning: this run into issue #73 - // @Override - // protected void installFeatures() { - // WavePanelResourceLoader.loadCss(); - // // KuneWavePanelResourceLoader.loadCss(); - // } - - }});} - - @Override protected AsyncHolder<StageThree> createStageThreeLoader(final StageTwo two) { return haltIfClosed(new StageThree.DefaultProvider(this.two = two) { @Override @@ -177,7 +167,7 @@ // Prepend an init wave flow onto the stage continuation. super.create(new Accessor<StageThree>() { @Override - public void use(StageThree x) { + public void use(final StageThree x) { onStageThreeLoaded(x, whenReady); } }); @@ -216,53 +206,32 @@ }); } - - private void onStageThreeLoaded(StageThree x, Accessor<StageThree> whenReady) { - if (closed) { - // Stop the loading process. - return; - } - three = x; - if (isNewWave) { - initNewWave(x); - } else { - handleExistingWave(x); - } - wave = new WaveContext( - two.getWave(), two.getConversations(), two.getSupplement(), two.getReadMonitor()); - waveStore.add(wave); - install(); - whenReady.use(x); - } - private void initNewWave(StageThree three) { - // Do the new-wave flow. - ModelAsViewProvider views = two.getModelAsViewProvider(); - BlipQueueRenderer blipQueue = two.getBlipQueue(); - ConversationView wave = two.getConversations(); + @Override + protected AsyncHolder<StageTwo> createStageTwoLoader(final StageOne one) { + return haltIfClosed(new StageTwoProvider(this.one = one, waveRef, channel, isNewWave, + idGenerator, profiles, waveUnsavedIndicator) { + // Kune patch + @Override + protected DomRenderer createRenderer() { + return KuneFullDomWaveRendererImpl.create(getConversations(), getProfileManager(), + getBlipDetailer(), getViewIdMapper(), getBlipQueue(), getThreadReadStateMonitor(), + createViewFactories(), showParticipantsPanel); + + // Warning: this run into issue #73 + // @Override + // protected void installFeatures() { + // WavePanelResourceLoader.loadCss(); + // // KuneWavePanelResourceLoader.loadCss(); + // } - // Force rendering to finish. - blipQueue.flush(); - BlipView blipUi = views.getBlipView(wave.getRoot().getRootThread().getFirstBlip()); - three.getEditActions().startEditing(blipUi); - } + }});} - private void handleExistingWave(StageThree three) { - if (waveRef.hasDocumentId()) { - BlipQueueRenderer blipQueue = two.getBlipQueue(); - blipQueue.flush(); - selectAndFocusOnBlip(two.getReader(), two.getModelAsViewProvider(), two.getConversations(), - one.getFocusFrame(), waveRef); + @Override + protected AsyncHolder<StageZero> createStageZeroLoader() { + return haltIfClosed(super.createStageZeroLoader()); } - } - - /** - * A hook to install features that are not dependent an a certain stage. - */ - protected void install() { - WindowTitleHandler.install(waveStore, waveFrame); - } - + public void destroy() { if (wave != null) { waveStore.remove(wave); @@ -294,26 +263,58 @@ } closed = true; } - /** - * Finds the blip that should receive the focus and selects it. - */ - private static void selectAndFocusOnBlip(Reader reader, ModelAsViewProvider views, - ConversationView wave, FocusFramePresenter focusFrame, WaveRef waveRef) { - FocusBlipSelector blipSelector = - FocusBlipSelector.create(wave, views, reader, new ViewTraverser()); - BlipView blipUi = blipSelector.selectBlipByWaveRef(waveRef); - // Focus on the selected blip. - if (blipUi != null) { - focusFrame.focus(blipUi); - } - } /** * @return a halting provider if this stage is closed. Otherwise, returns the * given provider. */ @SuppressWarnings("unchecked") // HALT is safe as a holder for any type - private <T> AsyncHolder<T> haltIfClosed(AsyncHolder<T> provider) { + private <T> AsyncHolder<T> haltIfClosed(final AsyncHolder<T> provider) { return closed ? (AsyncHolder<T>) HALT : provider; } + + private void handleExistingWave(final StageThree three) { + if (waveRef.hasDocumentId()) { + final BlipQueueRenderer blipQueue = two.getBlipQueue(); + blipQueue.flush(); + selectAndFocusOnBlip(two.getReader(), two.getModelAsViewProvider(), two.getConversations(), + one.getFocusFrame(), waveRef); + } + } + + private void initNewWave(final StageThree three) { + // Do the new-wave flow. + final ModelAsViewProvider views = two.getModelAsViewProvider(); + final BlipQueueRenderer blipQueue = two.getBlipQueue(); + final ConversationView wave = two.getConversations(); + + // Force rendering to finish. + blipQueue.flush(); + final BlipView blipUi = views.getBlipView(wave.getRoot().getRootThread().getFirstBlip()); + three.getEditActions().startEditing(blipUi); + } + /** + * A hook to install features that are not dependent an a certain stage. + */ + protected void install() { + WindowTitleHandler.install(waveStore, waveFrame); + } + + private void onStageThreeLoaded(final StageThree x, final Accessor<StageThree> whenReady) { + if (closed) { + // Stop the loading process. + return; + } + three = x; + if (isNewWave) { + initNewWave(x); + } else { + handleExistingWave(x); + } + wave = new WaveContext( + two.getWave(), two.getConversations(), two.getSupplement(), two.getReadMonitor()); + waveStore.add(wave); + install(); + whenReady.use(x); + } } Added: trunk/src/main/java/cc/kune/wave/client/WaveUnsavedIndicator.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveUnsavedIndicator.java (rev 0) +++ trunk/src/main/java/cc/kune/wave/client/WaveUnsavedIndicator.java 2012-05-30 10:46:29 UTC (rev 1877) @@ -0,0 +1,126 @@ +/* + * Copyright 2011 Google Inc. All Rights Reserved. + * + * 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. + */ + +package cc.kune.wave.client; + +import org.waveprotocol.wave.client.scheduler.Scheduler; +import org.waveprotocol.wave.client.scheduler.SchedulerInstance; +import org.waveprotocol.wave.client.scheduler.TimerService; +import org.waveprotocol.wave.concurrencycontrol.common.UnsavedDataListener; + +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.core.client.i18n.I18n; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class WaveUnsavedIndicator implements UnsavedDataListener { + + private enum SavedState { + SAVED, UNSAVED; + } + + private static final int UPDATE_DELAY_MS = 300; + + private SavedState currentSavedState = null; + + private final TimerService scheduler; + + private final Scheduler.Task updateTask = new Scheduler.Task() { + @Override + public void execute() { + updateDisplay(); + } + }; + + private SavedState visibleSavedState = SavedState.SAVED; + + /** + * Simple saved state indicator. + * + * @author danilatos(a)google.com (Daniel Danilatos) + * @author yurize(a)apache.org (Yuri Zelikov) + */ + @Inject + public WaveUnsavedIndicator() { + this.scheduler = SchedulerInstance.getLowPriorityTimer(); + } + + private void maybeUpdateDisplay() { + if (needsUpdating()) { + switch (currentSavedState) { + case SAVED: + scheduler.scheduleDelayed(updateTask, UPDATE_DELAY_MS); + break; + case UNSAVED: + updateDisplay(); + break; + default: + throw new AssertionError("unknown " + currentSavedState); + } + } else { + scheduler.cancel(updateTask); + } + } + + private boolean needsUpdating() { + return visibleSavedState != currentSavedState; + } + + @Override + public void onClose(final boolean everythingCommitted) { + if (everythingCommitted) { + saved(); + } else { + unsaved(); + } + } + + @Override + public void onUpdate(final UnsavedDataInfo unsavedDataInfo) { + if (unsavedDataInfo.estimateUnacknowledgedSize() != 0) { + currentSavedState = SavedState.UNSAVED; + unsaved(); + } else { + currentSavedState = SavedState.SAVED; + saved(); + } + } + + public void saved() { + maybeUpdateDisplay(); + } + + public void unsaved() { + maybeUpdateDisplay(); + } + + private void updateDisplay() { + visibleSavedState = currentSavedState; + switch (visibleSavedState) { + case SAVED: + NotifyUser.hideProgress(); + break; + case UNSAVED: + NotifyUser.showProgress(I18n.t("Saving")); + break; + default: + throw new AssertionError("unknown " + currentSavedState); + } + } + +} Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2012-05-24 13:19:59 UTC (rev 1876) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2012-05-30 10:46:29 UTC (rev 1877) @@ -106,27 +106,126 @@ interface Binder extends UiBinder<DockLayoutPanel, WebClient> { } + /** + * An exception handler that reports exceptions using a <em>shiny banner</em> + * (an alert placed on the top of the screen). Once the stack trace is + * prepared, it is revealed in the banner via a link. + */ + public static class ErrorHandler implements UncaughtExceptionHandler { + public static void getStackTraceAsync(final Throwable t, final Accessor<SafeHtml> whenReady) { + // TODO: Request stack-trace de-obfuscation. For now, just use the + // javascript stack trace. + // + // Use minimal services here, in order to avoid the chance that reporting + // the error produces more errors. In particular, do not use WIAB's + // scheduler to run this command. + // Also, this code could potentially be put behind a runAsync boundary, to + // save whatever dependencies it uses from the initial download. + new Timer() { + @Override + public void run() { + final SafeHtmlBuilder stack = new SafeHtmlBuilder(); + + Throwable error = t; + while (error != null) { + final String token = String.valueOf((new Date()).getTime()); + stack.appendHtmlConstant("Token: " + token + "<br> "); + stack.appendEscaped(String.valueOf(error.getMessage())).appendHtmlConstant("<br>"); + for (final StackTraceElement elt : error.getStackTrace()) { + stack.appendHtmlConstant(" ") + .appendEscaped(maybe(elt.getClassName(), "??")).appendHtmlConstant(".") // + .appendEscaped(maybe(elt.getMethodName(), "??")).appendHtmlConstant(" (") // + .appendEscaped(maybe(elt.getFileName(), "??")).appendHtmlConstant(":") // + .appendEscaped(maybe(elt.getLineNumber(), "??")).appendHtmlConstant(")") // + .appendHtmlConstant("<br>"); + } + error = error.getCause(); + if (error != null) { + stack.appendHtmlConstant("Caused by: "); + } + } + + whenReady.use(stack.toSafeHtml()); + } + }.schedule(1); + } + + public static void install() { + GWT.setUncaughtExceptionHandler(new ErrorHandler(GWT.getUncaughtExceptionHandler())); + } + + private static String maybe(final int value, final String otherwise) { + return value != -1 ? String.valueOf(value) : otherwise; + } + + private static String maybe(final String value, final String otherwise) { + return value != null ? value : otherwise; + } + + /** + * Indicates whether an error has already been reported (at most one error + * is ever reported by this handler). + */ + private boolean hasFired; + + /** Next handler in the handler chain. */ + private final UncaughtExceptionHandler next; + + private ErrorHandler(final UncaughtExceptionHandler next) { + this.next = next; + } + + @Override + public void onUncaughtException(final Throwable e) { + if (!hasFired) { + hasFired = true; + // final ErrorIndicatorPresenter error = + // ErrorIndicatorPresenter.create(RootPanel.get("banner")); + getStackTraceAsync(e, new Accessor<SafeHtml>() { + @Override + public void use(final SafeHtml stack) { + // error.addDetail(stack, null); + // REMOTE_LOG.severe(stack.asString().replace("<br>", "\n")); + final String message = stack.asString().replace("<br>", "\n"); + REMOTE_LOG.severe(message); + NotifyUser.logError(message); + NotifyUser.showProgress("Error"); + new Timer() { + @Override + public void run() { + NotifyUser.hideProgress(); + }}.schedule(5000); + } + }); + } + + if (next != null) { + next.onUncaughtException(e); + } + } + } + interface Style extends CssResource { } private static final Binder BINDER = GWT.create(Binder.class); + static Log LOG = Log.get(WebClient.class); - static Log LOG = Log.get(WebClient.class); // Use of GWT logging is only intended for sending exception reports to the // server, nothing else in the client should use java.util.logging. // Please also see WebClientDemo.gwt.xml. private static final Logger REMOTE_LOG = Logger.getLogger("REMOTE_LOG"); - /** Creates a popup that warns about network disconnects. */ private static UniversalPopup createTurbulencePopup() { - PopupChrome chrome = PopupChromeFactory.createPopupChrome(); - UniversalPopup popup = + final PopupChrome chrome = PopupChromeFactory.createPopupChrome(); + final UniversalPopup popup = PopupFactory.createPopup(null, new CenterPopupPositioner(), chrome, true); popup.add(new HTML("<div style='color: red; padding: 5px; text-align: center;'>" + "<b>A turbulence detected!<br></br>" + " Please save your last changes to somewhere and reload the wave.</b></div>")); return popup; } + private RemoteViewServiceMultiplexer channel; private final EventBus eventBus; @@ -136,8 +235,8 @@ private IdGenerator idGenerator; private final InboxCountPresenter inboxCount; + private final Element loading = new LoadingIndicator().getElement(); - private final Element loading = new LoadingIndicator().getElement(); private ParticipantId loggedInUser; @UiField @@ -148,10 +247,10 @@ @UiField(provided = true) final SearchPanelWidget searchPanel; + @UiField SplitLayoutPanel splitPanel; - @UiField Style style; @@ -162,9 +261,11 @@ @UiField FramedPanel waveFrame; - ImplPanel waveHolder; private final WaveStore waveStore = new SimpleWaveStore(); + + private final WaveUnsavedIndicator waveUnsavedIndicator; + /** * Create a remote websocket to talk to the server-side FedOne service. */ @@ -174,11 +275,12 @@ * This is the entry point method. */ @Inject - public WebClient(final EventBus eventBus, final KuneWaveProfileManager profiles, final InboxCountPresenter inboxCount, final TokenMatcher tokenMatcher, final cc.kune.core.client.state.Session session, final I18nTranslationService i18n) { + public WebClient(final EventBus eventBus, final KuneWaveProfileManager profiles, final InboxCountPresenter inboxCount, final TokenMatcher tokenMatcher, final cc.kune.core.client.state.Session session, final I18nTranslationService i18n, final WaveUnsavedIndicator waveUnsavedIndicator) { this.eventBus = eventBus; this.profiles = profiles; this.inboxCount = inboxCount; this.i18n = i18n; + this.waveUnsavedIndicator = waveUnsavedIndicator; searchPanel = new SearchPanelWidget(new SearchPanelRenderer(profiles)); ErrorHandler.install(); eventBus.addHandler(StackErrorEvent.getType(), new StackErrorEvent.StackErrorHandler() { @@ -268,12 +370,27 @@ public void getStackTraceAsync(final Throwable caught, final Accessor<SafeHtml> accessor) { ErrorHandler.getStackTraceAsync(caught, accessor); } - @Override public ImplPanel getWaveHolder() { return waveHolder; } + @Override + public WaveWebSocketClient getWebSocket() { + return websocket; + } + + + /** + * Returns <code>ws(s)://yourhost[:port]/</code>. + */ + // XXX check formatting wrt GPE + private native String getWebSocketBaseUrl(String moduleBase) /*-{ + return ((window.location.protocol == "https:") ? "wss" : "ws") + + /:\/\/[^\/]+/.exec(moduleBase)[0] + "/"; + }-*/; + + @Override public void login() { loginImpl(); } @@ -287,6 +404,12 @@ } } + /** + */ + private void loginToServer() { + assert loggedInUser != null; + channel = new RemoteViewServiceMultiplexer(websocket, loggedInUser.getAddress()); + } @Override public void logout() { @@ -297,130 +420,13 @@ clear(); } - @Override - public void setMaximized(final boolean maximized) { - splitPanel.setWidgetSize(searchPanel, maximized ? 0 : 400); - } - - private void setupUi() { - // Set up UI - DockLayoutPanel self = BINDER.createAndBindUi(this); - // kune-patch - // RootPanel.get("app").add(self); - initWidget(self); - waveHolder = new ImplPanel(""); - waveHolder.addStyleName("k-waveHolder"); - waveFrame.add(waveHolder); - // DockLayoutPanel forcibly conflicts with sensible layout control, and - // sticks inline styles on elements without permission. They must be - // cleared. - self.getElement().getStyle().clearPosition(); - splitPanel.setWidgetMinSize(searchPanel, 300); - - if (LogLevel.showDebug()) { - logPanel.enable(); - } else { - logPanel.removeFromParent(); - } - - setupSearchPanel(); - setupWavePanel(); - } - - @Override - public WaveWebSocketClient getWebSocket() { - return websocket; - } - - private void setupSearchPanel() { - // On wave action fire an event. - SearchPresenter.WaveActionHandler actionHandler = - new SearchPresenter.WaveActionHandler() { - @Override - public void onCreateWave() { - ClientEvents.get().fireEvent(WaveCreationEvent.CREATE_NEW_WAVE); - } - - @Override - public void onWaveSelected(WaveId id) { - ClientEvents.get().fireEvent(new WaveSelectionEvent(WaveRef.of(id))); - } - }; - Search search = SimpleSearch.create(RemoteSearchService.create(), waveStore); - search.addListener(inboxCount.getSearchListener()); - SearchPresenter.create(search, searchPanel, actionHandler, profiles); - } - - private void setupWavePanel() { - // Hide the frame until waves start getting opened. - UIObject.setVisible(waveFrame.getElement(), false); - - // Handles opening waves. - ClientEvents.get().addWaveSelectionEventHandler(new WaveSelectionEventHandler() { - @Override - public void onSelection(WaveRef waveRef) { - openWave(waveRef, false); - } - }); - } - - private void setupConnectionIndicator() { - ClientEvents.get().addNetworkStatusEventHandler(new NetworkStatusEventHandler() { - - boolean isTurbulenceDetected = false; - - @Override - public void onNetworkStatus(NetworkStatusEvent event) { - Element element = Document.get().getElementById("netstatus"); - if (element != null) { - switch (event.getStatus()) { - case CONNECTED: - case RECONNECTED: - element.setInnerText("Online"); - element.setClassName("online"); - isTurbulenceDetected = false; - turbulencePopup.hide(); - break; - case DISCONNECTED: - element.setInnerText("Offline"); - element.setClassName("offline"); - if (!isTurbulenceDetected) { - isTurbulenceDetected = true; - turbulencePopup.show(); - } - break; - case RECONNECTING: - element.setInnerText("Connecting..."); - element.setClassName("connecting"); - break; - } - } - } - }); - } - /** - * Returns <code>ws(s)://yourhost[:port]/</code>. - */ - // XXX check formatting wrt GPE - private native String getWebSocketBaseUrl(String moduleBase) /*-{return ((window.location.protocol == "https:") ? "wss" : "ws") + /:\/\/[^\/]+/.exec(moduleBase)[0] + "/";}-*/; - - private native boolean useSocketIO() /*-{ return !window.WebSocket }-*/; - - /** - */ - private void loginToServer() { - assert loggedInUser != null; - channel = new RemoteViewServiceMultiplexer(websocket, loggedInUser.getAddress()); - } - - /** * Shows a wave in a wave panel. * * @param waveRef wave id to open * @param isNewWave whether the wave is being created by this client session. */ - private void openWave(WaveRef waveRef, boolean isNewWave) { + private void openWave(final WaveRef waveRef, final boolean isNewWave) { LOG.info("WebClient.openWave()"); WaveClientClearEvent.fire(eventBus); @@ -430,9 +436,9 @@ // Release the display:none. UIObject.setVisible(waveFrame.getElement(), true); waveHolder.getElement().appendChild(loading); - Element holder = waveHolder.getElement().appendChild(Document.get().createDivElement()); - KuneStagesProvider wave = new KuneStagesProvider( - holder, (com.google.gwt.dom.client.Element) new Label().getElement(), waveHolder, waveFrame, waveRef, channel, idGenerator, profiles, waveStore, isNewWave, Session.get().getDomain(), true, i18n); + final Element holder = waveHolder.getElement().appendChild(Document.get().createDivElement()); + final KuneStagesProvider wave = new KuneStagesProvider( + holder, new Label().getElement(), waveHolder, waveFrame, waveRef, channel, idGenerator, profiles, waveStore, isNewWave, Session.get().getDomain(), true, i18n, waveUnsavedIndicator); this.wave = wave; wave.load(new Command() { @Override @@ -446,7 +452,7 @@ WaveRef fromWaveRef; try { fromWaveRef = GwtWaverefEncoder.decodeWaveRefFromPath(encodedToken); - } catch (InvalidWaveRefException e) { + } catch (final InvalidWaveRefException e) { LOG.info("History token contains invalid path: " + encodedToken); return; } @@ -461,102 +467,104 @@ SpaceConfEvent.fire(eventBus, Space.userSpace, tokenFromWaveref); History.newItem(tokenFromWaveref, false); } - /** - * An exception handler that reports exceptions using a <em>shiny banner</em> - * (an alert placed on the top of the screen). Once the stack trace is - * prepared, it is revealed in the banner via a link. - */ - public static class ErrorHandler implements UncaughtExceptionHandler { - public static void getStackTraceAsync(final Throwable t, final Accessor<SafeHtml> whenReady) { - // TODO: Request stack-trace de-obfuscation. For now, just use the - // javascript stack trace. - // - // Use minimal services here, in order to avoid the chance that reporting - // the error produces more errors. In particular, do not use WIAB's - // scheduler to run this command. - // Also, this code could potentially be put behind a runAsync boundary, to - // save whatever dependencies it uses from the initial download. - new Timer() { - @Override - public void run() { - SafeHtmlBuilder stack = new SafeHtmlBuilder(); + + @Override + public void setMaximized(final boolean maximized) { + splitPanel.setWidgetSize(searchPanel, maximized ? 0 : 400); + } - Throwable error = t; - while (error != null) { - String token = String.valueOf((new Date()).getTime()); - stack.appendHtmlConstant("Token: " + token + "<br> "); - stack.appendEscaped(String.valueOf(error.getMessage())).appendHtmlConstant("<br>"); - for (StackTraceElement elt : error.getStackTrace()) { - stack.appendHtmlConstant(" ") - .appendEscaped(maybe(elt.getClassName(), "??")).appendHtmlConstant(".") // - .appendEscaped(maybe(elt.getMethodName(), "??")).appendHtmlConstant(" (") // - .appendEscaped(maybe(elt.getFileName(), "??")).appendHtmlConstant(":") // - .appendEscaped(maybe(elt.getLineNumber(), "??")).appendHtmlConstant(")") // - .appendHtmlConstant("<br>"); - } - error = error.getCause(); - if (error != null) { - stack.appendHtmlConstant("Caused by: "); - } + private void setupConnectionIndicator() { + ClientEvents.get().addNetworkStatusEventHandler(new NetworkStatusEventHandler() { + + boolean isTurbulenceDetected = false; + + @Override + public void onNetworkStatus(final NetworkStatusEvent event) { + final Element element = Document.get().getElementById("netstatus"); + if (element != null) { + switch (event.getStatus()) { + case CONNECTED: + case RECONNECTED: + element.setInnerText("Online"); + element.setClassName("online"); + isTurbulenceDetected = false; + turbulencePopup.hide(); + break; + case DISCONNECTED: + element.setInnerText("Offline"); + element.setClassName("offline"); + if (!isTurbulenceDetected) { + isTurbulenceDetected = true; + turbulencePopup.show(); + } + break; + case RECONNECTING: + element.setInnerText("Connecting..."); + element.setClassName("connecting"); + break; } - - whenReady.use(stack.toSafeHtml()); } - }.schedule(1); - } + } + }); + } + + private void setupSearchPanel() { + // On wave action fire an event. + final SearchPresenter.WaveActionHandler actionHandler = + new SearchPresenter.WaveActionHandler() { + @Override + public void onCreateWave() { + ClientEvents.get().fireEvent(WaveCreationEvent.CREATE_NEW_WAVE); + } - public static void install() { - GWT.setUncaughtExceptionHandler(new ErrorHandler(GWT.getUncaughtExceptionHandler())); + @Override + public void onWaveSelected(final WaveId id) { + ClientEvents.get().fireEvent(new WaveSelectionEvent(WaveRef.of(id))); + } + }; + final Search search = SimpleSearch.create(RemoteSearchService.create(), waveStore); + search.addListener(inboxCount.getSearchListener()); + SearchPresenter.create(search, searchPanel, actionHandler, profiles); + } + + private void setupUi() { + // Set up UI + final DockLayoutPanel self = BINDER.createAndBindUi(this); + // kune-patch + // RootPanel.get("app").add(self); + initWidget(self); + waveHolder = new ImplPanel(""); + waveHolder.addStyleName("k-waveHolder"); + waveFrame.add(waveHolder); + // DockLayoutPanel forcibly conflicts with sensible layout control, and + // sticks inline styles on elements without permission. They must be + // cleared. + self.getElement().getStyle().clearPosition(); + splitPanel.setWidgetMinSize(searchPanel, 300); + + if (LogLevel.showDebug()) { + logPanel.enable(); + } else { + logPanel.removeFromParent(); } + + setupSearchPanel(); + setupWavePanel(); + } - private static String maybe(final int value, final String otherwise) { - return value != -1 ? String.valueOf(value) : otherwise; - } + private void setupWavePanel() { + // Hide the frame until waves start getting opened. + UIObject.setVisible(waveFrame.getElement(), false); - private static String maybe(final String value, final String otherwise) { - return value != null ? value : otherwise; - } - - /** - * Indicates whether an error has already been reported (at most one error - * is ever reported by this handler). - */ - private boolean hasFired; - - /** Next handler in the handler chain. */ - private final UncaughtExceptionHandler next; - - private ErrorHandler(final UncaughtExceptionHandler next) { - this.next = next; - } - - @Override - public void onUncaughtException(final Throwable e) { - if (!hasFired) { - hasFired = true; - // final ErrorIndicatorPresenter error = - // ErrorIndicatorPresenter.create(RootPanel.get("banner")); - getStackTraceAsync(e, new Accessor<SafeHtml>() { - @Override - public void use(final SafeHtml stack) { - // error.addDetail(stack, null); - // REMOTE_LOG.severe(stack.asString().replace("<br>", "\n")); - final String message = stack.asString().replace("<br>", "\n"); - REMOTE_LOG.severe(message); - NotifyUser.logError(message); - NotifyUser.showProgress("Error"); - new Timer() { - @Override - public void run() { - NotifyUser.hideProgress(); - }}.schedule(5000); - } - }); + // Handles opening waves. + ClientEvents.get().addWaveSelectionEventHandler(new WaveSelectionEventHandler() { + @Override + public void onSelection(final WaveRef waveRef) { + openWave(waveRef, false); } - - if (next != null) { - next.onUncaughtException(e); - } - } + }); } + private native boolean useSocketIO() /*-{ + return !window.WebSocket + }-*/; }

1 0

[kune issues] #278: Implements a custom UnsavedDataListener
by kune issues 30 May '12

30 May '12

#278: Implements a custom UnsavedDataListener --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: major | Milestone: Component: User space | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ So we are aware of what things (in wave) are pending to be saved -- Ticket URL: <http://kune.ourproject.org/issues/ticket/278> kune issues <http://kune.ourproject.org/issues/>

1 1

[kune issues] #277: Permanently loading waves
by kune issues 28 May '12

28 May '12

#277: Permanently loading waves -------------------------+------------------- Reporter: samer | Owner: vjrj Type: defect | Status: new Priority: major | Milestone: Component: WIAB Server | Version: Keywords: | Blocked By: Blocking: | -------------------------+------------------- Since a few days, there are waves that we cannot access. I have tried to go to the groupspace and come back, to access them from the groupspace or inbox, to play in the groupspace a bit before trying, to log out and in, to refresh with CTRL+F5, to see other waves... Other waves can be seen perfectly but these ones no. It seems it is happening with long waves. Sometimes I do access to these problematic waves, I don't know why. I have a copied two times errors that appeared. Once that I couldnt enter: Token: 1338226605772 org.waveprotocol.wave.concurrencycontrol.common.CorruptionDetail: [INTERNAL_ERROR] Channel Exception Unknown.Jzc (Unknown source:0) Unknown.Rzc (Unknown source:0) Unknown.Xzc (Unknown source:0) Unknown.Ram (Unknown source:0) Unknown.ueo (Unknown source:0) Unknown.qeo (Unknown source:0) Unknown.Keo (Unknown source:0) Unknown.Ifo (Unknown source:0) Unknown.Jfo (Unknown source:0) Unknown.kKl (Unknown source:0) Unknown.RJl (Unknown source:0) Unknown.CMl (Unknown source:0) Unknown.L4k (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.Xbi (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.anonymous (Unknown source:0) Caused by: Token: 1338226605773 [INTERNAL_ERROR] Channel Exception Unknown.Jzc (Unknown source:0) Unknown.Ljo (Unknown source:0) Unknown.ueo (Unknown source:0) Unknown.qeo (Unknown source:0) Unknown.Keo (Unknown source:0) Unknown.Ifo (Unknown source:0) Unknown.Jfo (Unknown source:0) Unknown.kKl (Unknown source:0) Unknown.RJl (Unknown source:0) Unknown.CMl (Unknown source:0) Unknown.L4k (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.Xbi (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.anonymous (Unknown source:0) Caused by: Token: 1338226605774 Exception in view channel, state [ViewChannel id: null waveId: [WaveId kune.cc/w+oyar3hsw16chA] state: CONNECTING] Unknown.Jzc (Unknown source:0) Unknown.Fjo (Unknown source:0) Unknown.Ifo (Unknown source:0) Unknown.Jfo (Unknown source:0) Unknown.kKl (Unknown source:0) Unknown.RJl (Unknown source:0) Unknown.CMl (Unknown source:0) Unknown.L4k (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.Xbi (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.anonymous (Unknown source:0) Caused by: Token: 1338226605774 First update did not contain channel id. Wave id: [WaveId kune.cc/w+oyar3hsw16chA], update: org.waveprotocol.box.webclient.client.RemoteWaveViewService$WaveViewServiceUpdateImpl@170c Unknown.Jzc (Unknown source:0) Unknown.Fjo (Unknown source:0) Unknown.Gjo (Unknown source:0) Unknown.Jfo (Unknown source:0) Unknown.kKl (Unknown source:0) Unknown.RJl (Unknown source:0) Unknown.CMl (Unknown source:0) Unknown.L4k (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.Xbi (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.anonymous (Unknown source:0) Once that I could (but this Error appeared): Token: 1338227016329 org.waveprotocol.wave.concurrencycontrol.common.CorruptionDetail: [INTERNAL_ERROR] Channel Exception Unknown.Kzc (Unknown source:0) Unknown.Szc (Unknown source:0) Unknown.Yzc (Unknown source:0) Unknown.rbm (Unknown source:0) Unknown.Weo (Unknown source:0) Unknown.Seo (Unknown source:0) Unknown.kfo (Unknown source:0) Unknown.jgo (Unknown source:0) Unknown.MKl (Unknown source:0) Unknown.rKl (Unknown source:0) Unknown.cNl (Unknown source:0) Unknown.l5k (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.Ybi (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.anonymous (Unknown source:0) Caused by: Token: 1338227016330 [INTERNAL_ERROR] Channel Exception Unknown.Kzc (Unknown source:0) Unknown.lko (Unknown source:0) Unknown.Weo (Unknown source:0) Unknown.Seo (Unknown source:0) Unknown.kfo (Unknown source:0) Unknown.jgo (Unknown source:0) Unknown.MKl (Unknown source:0) Unknown.rKl (Unknown source:0) Unknown.cNl (Unknown source:0) Unknown.l5k (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.Ybi (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.anonymous (Unknown source:0) Caused by: Token: 1338227016330 Exception in view channel, state [ViewChannel id: ch454 waveId: [WaveId kune.cc/w+oyar3hsw16chA] state: CONNECTED] Unknown.Kzc (Unknown source:0) Unknown.fko (Unknown source:0) Unknown.jgo (Unknown source:0) Unknown.MKl (Unknown source:0) Unknown.rKl (Unknown source:0) Unknown.cNl (Unknown source:0) Unknown.l5k (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.Ybi (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.anonymous (Unknown source:0) Caused by: Token: 1338227016330 Multiplexer received openFinished twice Unknown.Kzc (Unknown source:0) Unknown.fko (Unknown source:0) Unknown.lfo (Unknown source:0) Unknown.jgo (Unknown source:0) Unknown.MKl (Unknown source:0) Unknown.rKl (Unknown source:0) Unknown.cNl (Unknown source:0) Unknown.l5k (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.Ybi (Unknown source:0) Unknown.anonymous (Unknown source:0) Unknown.anonymous (Unknown source:0) -- Ticket URL: <http://kune.ourproject.org/issues/ticket/277> kune issues <http://kune.ourproject.org/issues/>

1 2

r1876 - in trunk: . src/main/java/cc/kune/client src/main/java/cc/kune/common/client/utils src/main/java/cc/kune/core/client src/main/java/cc/kune/core/client/auth src/main/java/cc/kune/core/client/events src/main/java/cc/kune/core/client/i18n src/main/java/cc/kune/core/client/init src/main/java/cc/kune/core/shared/dto
by Vicente J. Ruiz Jurado 24 May '12

24 May '12

Author: vjrj_ Date: 2012-05-24 15:19:59 +0200 (Thu, 24 May 2012) New Revision: 1876 Added: trunk/src/main/java/cc/kune/core/client/CoreConstants.java trunk/src/main/java/cc/kune/core/client/auth/EmailNotVerifiedReminder.java trunk/src/main/java/cc/kune/core/client/init/WebSocketChecker.java Modified: trunk/TODO trunk/TROUBLESHOOT trunk/src/main/java/cc/kune/client/OnAppStartFactory.java trunk/src/main/java/cc/kune/common/client/utils/WindowUtils.java trunk/src/main/java/cc/kune/core/client/CoreParts.java trunk/src/main/java/cc/kune/core/client/events/AppStartEvent.java trunk/src/main/java/cc/kune/core/client/events/AppStopEvent.java trunk/src/main/java/cc/kune/core/client/events/UserSignOutEvent.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java Log: CLOSED - # 271: Add two new UserNotifications: Email not confirmed, Websocket not supported http://kune.ourproject.org/issues/ticket/271 Modified: trunk/TODO =================================================================== --- trunk/TODO 2012-05-23 22:18:52 UTC (rev 1875) +++ trunk/TODO 2012-05-24 13:19:59 UTC (rev 1876) @@ -12,6 +12,8 @@ nick == assigned to * SHORT-TERM (URGENT) +** Stats via munin +GRANT SELECT ON kune_dev.* TO kune_stats@'localhost' IDENTIFIED BY 'db4kune'; ** Session expired 12-04-09 00:14:29 GWTServiceFilter [INFO] -------------------------------------------------------------------------------- 2012-04-09 00:14:29 GWTServiceFilter [DEBUG] SERVICE: /ws/UserService - UserService Modified: trunk/TROUBLESHOOT =================================================================== --- trunk/TROUBLESHOOT 2012-05-23 22:18:52 UTC (rev 1875) +++ trunk/TROUBLESHOOT 2012-05-24 13:19:59 UTC (rev 1876) @@ -25,8 +25,13 @@ ** Mysql *** Mysql: Caused by: java.sql.SQLException: Access denied for user 'kune'@'localhost' (using password: YES) -Check that the password you have use in the database creation it's the same like the kune.properties. If it's wrong maybe you have to remove the mysql user (DROP USER) and repeat the GRANT sentences of the INSTALL. +Check that the password you have use in the database creation it's the same like the kune.properties. If it's wrong maybe you have to remove the mysql user (DROP USER) and repeat the GRANT sentences of the INSTALL, for instance: +DROP USER kune@localhost; +GRANT ALL PRIVILEGES ON kune_prod.* TO kune@localhost IDENTIFIED BY 'db4kune'; +GRANT ALL PRIVILEGES ON kune_openfire.* TO kune@localhost IDENTIFIED BY 'db4kune'; +FLUSH PRIVILEGES; + Also, be sure you do a "mvn compile" if you are running kune from the source and you change the kune.properties file to not use the old one. If you have this problem with openfire it's not enough to change the password in openfire.xml because probably it's already stored in the ofProperty openfire table and you need to change the password there. Modified: trunk/src/main/java/cc/kune/client/OnAppStartFactory.java =================================================================== --- trunk/src/main/java/cc/kune/client/OnAppStartFactory.java 2012-05-23 22:18:52 UTC (rev 1875) +++ trunk/src/main/java/cc/kune/client/OnAppStartFactory.java 2012-05-24 13:19:59 UTC (rev 1876) @@ -38,7 +38,6 @@ @Override public void onAppStart(final AppStartEvent event) { newGroup.get(); - // } }); } Modified: trunk/src/main/java/cc/kune/common/client/utils/WindowUtils.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/WindowUtils.java 2012-05-23 22:18:52 UTC (rev 1875) +++ trunk/src/main/java/cc/kune/common/client/utils/WindowUtils.java 2012-05-24 13:19:59 UTC (rev 1876) @@ -15,9 +15,33 @@ */ package cc.kune.common.client.utils; - public class WindowUtils { + /** + * https://developer.mozilla.org/en/DOM/window.location + * + * @param newUrl + */ + public static native void changeHref(String newUrl) /*-{ + $wnd.location.href = newUrl; + }-*/; + + /** + * https://developer.mozilla.org/en/DOM/window.location + * + * "If you need to change pathname but keep the hash as is, use the replace() method instead, which should work consistently across browsers." + * + * @param newUrl + */ + public static native void changeHrefKeepHash(String newUrl) /*-{ + // $wnd.location.href = newUrl; + $wnd.location.replace(newUrl); + }-*/; + + public static native boolean dontHasWebSocket() /*-{ + return !window.WebSocket + }-*/; + private static native String getHash() /*-{ return $wnd.location.hash; }-*/; Added: trunk/src/main/java/cc/kune/core/client/CoreConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/CoreConstants.java 2012-05-24 13:19:59 UTC (rev 1876) @@ -0,0 +1,29 @@ +/* + * + * Copyright (C) 2007-2012 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +package cc.kune.core.client; + +public class CoreConstants { + public static final String MOZILLA_FF_LINK = "https://www.mozilla.com/en-US/firefox/fx/"; + + private CoreConstants() { + } + +} Modified: trunk/src/main/java/cc/kune/core/client/CoreParts.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2012-05-23 22:18:52 UTC (rev 1875) +++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2012-05-24 13:19:59 UTC (rev 1876) @@ -22,11 +22,13 @@ import cc.kune.common.client.shortcuts.GlobalShortcuts; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.auth.AnonUsersManager; +import cc.kune.core.client.auth.EmailNotVerifiedReminder; import cc.kune.core.client.auth.Register; import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.events.AppStartEvent; import cc.kune.core.client.events.AppStartEvent.AppStartHandler; import cc.kune.core.client.groups.newgroup.NewGroup; +import cc.kune.core.client.init.WebSocketChecker; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.sitebar.AboutKuneDialog; import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; @@ -72,7 +74,8 @@ final Provider<UserOptions> userOptionsDialog, final Provider<GroupOptions> groupOptionsDialog, final Provider<PasswordResetPanel> passReset, final Provider<AskForPasswordResetPanel> askForPass, final GlobalShortcuts shortcuts, final I18nTranslationService i18n, - final Provider<TutorialViewer> tutorialViewer) { + final Provider<TutorialViewer> tutorialViewer, final Provider<WebSocketChecker> websocketChecker, + final Provider<EmailNotVerifiedReminder> emailNotVerifiedReminder) { session.onAppStart(true, new AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { @@ -84,6 +87,8 @@ anonUsers.get(); spaceSelector.get(); tutorialViewer.get(); + emailNotVerifiedReminder.get(); + websocketChecker.get(); } }); tokenListener.put(SiteTokens.SIGN_IN, new HistoryTokenAuthNotNeededCallback() { Added: trunk/src/main/java/cc/kune/core/client/auth/EmailNotVerifiedReminder.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/EmailNotVerifiedReminder.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/auth/EmailNotVerifiedReminder.java 2012-05-24 13:19:59 UTC (rev 1876) @@ -0,0 +1,69 @@ +/* + * + * Copyright (C) 2007-2012 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +package cc.kune.core.client.auth; + +import java.util.Date; + +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.shared.utils.TextUtils; +import cc.kune.core.client.events.UserSignInEvent; +import cc.kune.core.client.events.UserSignInEvent.UserSignInHandler; +import cc.kune.core.client.i18n.I18n; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.SiteTokens; +import cc.kune.core.shared.SessionConstants; +import cc.kune.core.shared.dto.UserSimpleDTO; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; + +public class EmailNotVerifiedReminder { + + /** + * This class checks if the user has verified the email if it's not, give some + * advice. + * + * @param session + * the session + */ + @Inject + public EmailNotVerifiedReminder(final Session session, final EventBus eventBus, + final I18nUITranslationService i18n) { + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + final UserSimpleDTO currentUser = session.getCurrentUser(); + if (!currentUser.isEmailVerified()) { + final long now = new Date().getTime(); + if ((currentUser.getCreatedOn() + SessionConstants._AN_HOUR) < now) { + final String link = TextUtils.generateHtmlLink("#" + SiteTokens.PREFS, + I18n.t("verify your email"), false); + NotifyUser.info(I18n.t( + "Your email is not verified, [%s] functionality will work better if you [%s]", + i18n.getSiteCommonName(), link), true); + } + } + } + }); + } + +} Modified: trunk/src/main/java/cc/kune/core/client/events/AppStartEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/events/AppStartEvent.java 2012-05-23 22:18:52 UTC (rev 1875) +++ trunk/src/main/java/cc/kune/core/client/events/AppStartEvent.java 2012-05-24 13:19:59 UTC (rev 1876) @@ -23,7 +23,6 @@ import com.google.gwt.event.shared.GwtEvent; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.event.shared.HasHandlers; -import com.gwtplatform.mvp.client.HasEventBus; public class AppStartEvent extends GwtEvent<AppStartEvent.AppStartHandler> { @@ -37,7 +36,7 @@ private static final Type<AppStartHandler> TYPE = new Type<AppStartHandler>(); - public static void fire(HasEventBus source, cc.kune.core.shared.dto.InitDataDTO initData) { + public static void fire(HasHandlers source, cc.kune.core.shared.dto.InitDataDTO initData) { source.fireEvent(new AppStartEvent(initData)); } Modified: trunk/src/main/java/cc/kune/core/client/events/AppStopEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/events/AppStopEvent.java 2012-05-23 22:18:52 UTC (rev 1875) +++ trunk/src/main/java/cc/kune/core/client/events/AppStopEvent.java 2012-05-24 13:19:59 UTC (rev 1876) @@ -23,21 +23,20 @@ import com.google.gwt.event.shared.GwtEvent; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.event.shared.HasHandlers; -import com.gwtplatform.mvp.client.HasEventBus; -public class AppStopEvent extends GwtEvent<AppStopEvent.AppStopHandler> { +public class AppStopEvent extends GwtEvent<AppStopEvent.AppStopHandler> { - public interface HasAppStopHandlers extends HasHandlers { - HandlerRegistration addAppStopHandler(AppStopHandler handler); - } - public interface AppStopHandler extends EventHandler { public void onAppStop(AppStopEvent event); } + public interface HasAppStopHandlers extends HasHandlers { + HandlerRegistration addAppStopHandler(AppStopHandler handler); + } + private static final Type<AppStopHandler> TYPE = new Type<AppStopHandler>(); - public static void fire(HasEventBus source) { + public static void fire(final HasHandlers source) { source.fireEvent(new AppStopEvent()); } @@ -45,31 +44,28 @@ return TYPE; } - public AppStopEvent() { } @Override - public Type<AppStopHandler> getAssociatedType() { - return TYPE; - } - - @Override - protected void dispatch(AppStopHandler handler) { + protected void dispatch(final AppStopHandler handler) { handler.onAppStop(this); } @Override - public boolean equals(Object other) { + public boolean equals(final Object other) { if (other != null && other.getClass().equals(this.getClass())) { - AppStopEvent o = (AppStopEvent) other; - return true - ; + return true; } return false; } @Override + public Type<AppStopHandler> getAssociatedType() { + return TYPE; + } + + @Override public int hashCode() { int hashCode = 23; hashCode = (hashCode * 37) + getClass().hashCode(); @@ -78,8 +74,7 @@ @Override public String toString() { - return "AppStopEvent[" - + "]"; + return "AppStopEvent[" + "]"; } } Modified: trunk/src/main/java/cc/kune/core/client/events/UserSignOutEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/events/UserSignOutEvent.java 2012-05-23 22:18:52 UTC (rev 1875) +++ trunk/src/main/java/cc/kune/core/client/events/UserSignOutEvent.java 2012-05-24 13:19:59 UTC (rev 1876) @@ -23,7 +23,6 @@ import com.google.gwt.event.shared.GwtEvent; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.event.shared.HasHandlers; -import com.gwtplatform.mvp.client.HasEventBus; public class UserSignOutEvent extends GwtEvent<UserSignOutEvent.UserSignOutHandler> { @@ -37,7 +36,7 @@ private static final Type<UserSignOutHandler> TYPE = new Type<UserSignOutHandler>(); - public static void fire(final HasEventBus source) { + public static void fire(final HasHandlers source) { source.fireEvent(new UserSignOutEvent()); } Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2012-05-23 22:18:52 UTC (rev 1875) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2012-05-24 13:19:59 UTC (rev 1876) @@ -147,18 +147,6 @@ } /** - * https://developer.mozilla.org/en/DOM/window.location - * - * "If you need to change pathname but keep the hash as is, use the replace() method instead, which should work consistently across browsers." - * - * @param newUrl - */ - private native void changeHref(String newUrl) /*-{ - // $wnd.location.href = newUrl; - $wnd.location.replace(newUrl); - }-*/; - - /** * See in: * http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread * /5e4e25050d3be984/7035ec39354d06aa?lnk=gst&q=get+locale&rnum=23 @@ -170,7 +158,7 @@ * String value of the new locale to go to. */ private void changeLanguageInUrl(final String newLocale) { - Location location = WindowUtils.getLocation(); + final Location location = WindowUtils.getLocation(); final String hash = location.getHash(); final String query = location.getQueryString(); final String protocol = location.getProtocol(); @@ -179,7 +167,7 @@ Log.info("Locale current query: " + query); Log.info("Locale current hash: " + hash); Log.info("Locale new Url: " + newUrl); - changeHref(protocol + "//" + location.getHost() + newUrl); + WindowUtils.changeHrefKeepHash(protocol + "//" + location.getHost() + newUrl); } public void changeToLanguageIfNecessary(final String wantedLang, final String wantedLangEnglishName, Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2012-05-23 22:18:52 UTC (rev 1875) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2012-05-24 13:19:59 UTC (rev 1876) @@ -26,6 +26,8 @@ import cc.kune.common.client.notify.UserNotifyEvent; import cc.kune.common.client.resources.CommonResources; import cc.kune.common.shared.utils.SimpleResponseCallback; +import cc.kune.common.shared.utils.TextUtils; +import cc.kune.core.client.CoreConstants; import cc.kune.core.client.events.AppStartEvent; import cc.kune.core.client.events.AppStopEvent; import cc.kune.core.client.rpcservices.SiteServiceAsync; @@ -114,8 +116,9 @@ NotifyUser.askConfirmation( res.important32(), "Your browser is currently unsupported", - "Please, use a free/libre modern navigator like <a class='k-link' href='https://www.mozilla.com/en-US/firefox/fx/'>Mozilla Firefox</a> instead. Continue anyway?", - new SimpleResponseCallback() { + "Please, use a free/libre modern navigator like " + + TextUtils.generateHtmlLink(CoreConstants.MOZILLA_FF_LINK, "Mozilla Firefox") + + " instead. Continue anyway?", new SimpleResponseCallback() { @Override public void onCancel() { } Added: trunk/src/main/java/cc/kune/core/client/init/WebSocketChecker.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/WebSocketChecker.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/init/WebSocketChecker.java 2012-05-24 13:19:59 UTC (rev 1876) @@ -0,0 +1,74 @@ +/* + * + * Copyright (C) 2007-2012 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +package cc.kune.core.client.init; + +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.resources.CommonResources; +import cc.kune.common.client.utils.WindowUtils; +import cc.kune.common.shared.utils.SimpleResponseCallback; +import cc.kune.common.shared.utils.TextUtils; +import cc.kune.core.client.CoreConstants; +import cc.kune.core.client.events.AppStartEvent; +import cc.kune.core.client.events.AppStartEvent.AppStartHandler; +import cc.kune.core.client.i18n.I18n; +import cc.kune.core.client.state.Session; + +import com.google.inject.Inject; + +public class WebSocketChecker { + + /** + * This class check if the browser supports websockets and give some advices + * to the user. + * + * @param session + * the session + * @param res + * the resources + */ + @Inject + public WebSocketChecker(final Session session, final CommonResources res) { + session.onAppStart(true, new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + if (WindowUtils.dontHasWebSocket()) { + final String mozLink = TextUtils.generateHtmlLink(CoreConstants.MOZILLA_FF_LINK, + "Mozilla Firefox"); + NotifyUser.askConfirmation( + res.important32(), + I18n.t("Your browser is currently unsupported"), + I18n.t( + "Please, use a free/libre modern and updated navigator like [%s] instead. Some functionality like concurrent edition will now work properly. Continue anyway?", + mozLink), new SimpleResponseCallback() { + @Override + public void onCancel() { + WindowUtils.changeHref(mozLink); + } + + @Override + public void onSuccess() { + } + }); + } + } + }); + } +} Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java 2012-05-23 22:18:52 UTC (rev 1875) +++ trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java 2012-05-24 13:19:59 UTC (rev 1876) @@ -26,6 +26,7 @@ public class UserSimpleDTO implements IsSerializable { private String compoundName; private I18nCountryDTO country; + private Long createdOn; private String email; private EmailNotificationFrequency emailNotifFreq; private boolean emailVerified; @@ -90,6 +91,10 @@ return country; } + public Long getCreatedOn() { + return createdOn; + } + public String getEmail() { return email; } @@ -151,6 +156,10 @@ this.country = country; } + public void setCreatedOn(final Long createdOn) { + this.createdOn = createdOn; + } + public void setEmail(final String email) { this.email = email; }

1 0

[kune issues] #271: Add two new UserNotifications: Email not confirmed, Websocket not supported
by kune issues 24 May '12

24 May '12

#271: Add two new UserNotifications: Email not confirmed, Websocket not supported --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: Group space | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ Should be useful for user, to get two notifications after kune starts: - If your email is not confirmed - If your browser doesn't support websocket with a message like "Your browser is not supported, please try to use ff, etc..." -- Ticket URL: <http://kune.ourproject.org/issues/ticket/271> kune issues <http://kune.ourproject.org/issues/>

1 1

[kune issues] #275: Menus should open when mouse down
by kune issues 23 May '12

23 May '12

#275: Menus should open when mouse down --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: Usability | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ https://kune.cc/?locale=es#kune.lists.979.2113 -- Ticket URL: <http://kune.ourproject.org/issues/ticket/275> kune issues <http://kune.ourproject.org/issues/>

1 0

r1875 - trunk/src/main/java/cc/kune/core/server
by Vicente J. Ruiz Jurado 23 May '12

23 May '12

Author: vjrj_ Date: 2012-05-24 00:18:52 +0200 (Thu, 24 May 2012) New Revision: 1875 Modified: trunk/src/main/java/cc/kune/core/server/UserSessionManager.java Log: CLOSED - # 270: Notifications send to online users also (if server restarts) http://kune.ourproject.org/issues/ticket/270 Modified: trunk/src/main/java/cc/kune/core/server/UserSessionManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/UserSessionManager.java 2012-05-21 17:22:09 UTC (rev 1874) +++ trunk/src/main/java/cc/kune/core/server/UserSessionManager.java 2012-05-23 22:18:52 UTC (rev 1875) @@ -107,16 +107,12 @@ } public void logout() { - if (isUserLoggedIn()) { - logins.remove(getUserLoggedShortName()); - } + logins.remove(getUserLoggedShortName()); getUserSession().setUserId(null); getUserSession().setHash(null); } public void updateLoggedUser() { - if (isUserLoggedIn()) { - logins.add(getUserLoggedShortName()); - } + logins.add(getUserLoggedShortName()); } }

1 0

[kune issues] #270: Notifications send to online users also (if server restarts)
by kune issues 23 May '12

23 May '12

#270: Notifications send to online users also (if server restarts) --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: defect | Status: new Priority: minor | Milestone: Component: Server side | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ Seems like users online should be updated after server restart... -- Ticket URL: <http://kune.ourproject.org/issues/ticket/270> kune issues <http://kune.ourproject.org/issues/>

1 1

r1874 - in trunk: debian src/main/java/cc/kune/core/client/actions/xml src/main/java/cc/kune/core/public src/main/webapp/tutorials
by Vicente J. Ruiz Jurado 21 May '12

21 May '12

Author: vjrj_ Date: 2012-05-21 19:22:09 +0200 (Mon, 21 May 2012) New Revision: 1874 Modified: trunk/debian/changelog trunk/debian/files trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java trunk/src/main/java/cc/kune/core/public/about.html trunk/src/main/webapp/tutorials/barters.svg trunk/src/main/webapp/tutorials/blogs.svg trunk/src/main/webapp/tutorials/chats.svg trunk/src/main/webapp/tutorials/docs.svg trunk/src/main/webapp/tutorials/events.svg trunk/src/main/webapp/tutorials/lists.svg trunk/src/main/webapp/tutorials/tasks.svg trunk/src/main/webapp/tutorials/wiki.svg Log: CLOSED - # 273: Some http usage breaks SSL http://kune.ourproject.org/issues/ticket/273 Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/debian/changelog 2012-05-21 17:22:09 UTC (rev 1874) @@ -1,3 +1,9 @@ +kune (0.2.0+b7) unstable; urgency=low + + * Fix some SSL issues + + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Mon, 21 May 2012 01:31:41 +0200 + kune (0.2.0+b6) unstable; urgency=low * Wave code updated (changes: search via lucene, ctrl-k for links, etc) Modified: trunk/debian/files =================================================================== --- trunk/debian/files 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/debian/files 2012-05-21 17:22:09 UTC (rev 1874) @@ -1 +1 @@ -kune_0.2.0+b6_all.deb java optional +kune_0.2.0+b7_all.deb java optional Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2012-05-21 17:22:09 UTC (rev 1874) @@ -169,12 +169,14 @@ // container) action = new AddGadgetAction(contentService, session, i18n, descrip.getRol().getRolRequired(), descrip.getRol().isAuthNeed(), - extension.getExtName(), descrip.getDescName(), extension.getIconUrl()); + extension.getExtName(), descrip.getDescName(), proxy(extension.getIconUrl(), + extension.getGadgetUrl())); } else { action = new NewGadgetAction(contentService, contentViewer, stateManager, session, i18n, descrip.getRol().getRolRequired(), descrip.getRol().isAuthNeed(), - extension.getExtName(), destTypeId, extension.getIconUrl(), - descrip.getNewContentTitle(), TextUtils.empty(contentIntro) ? "" : contentIntro); + extension.getExtName(), destTypeId, proxy(extension.getIconUrl(), + extension.getGadgetUrl()), descrip.getNewContentTitle(), + TextUtils.empty(contentIntro) ? "" : contentIntro); } final Provider<GuiActionDescrip> menuItemProvider = createMenuItem(descrip, tool, origTypeId, action); @@ -183,4 +185,11 @@ } } } + + private String proxy(String iconUrl, String gadgetUrl) { + // FIXME: create a proxy servlet for that + // More info: http://edwardstx.net/2010/06/http-proxy-servlet/ + return "https://www-ig-opensocial.googleusercontent.com/gadgets/proxy?refresh=86400…" + + iconUrl + "&container=ig&gadget=" + gadgetUrl; + } } Modified: trunk/src/main/java/cc/kune/core/public/about.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/about.html 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/java/cc/kune/core/public/about.html 2012-05-21 17:22:09 UTC (rev 1874) @@ -16,7 +16,7 @@ }); </script> <link - href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic' + href='https://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,boldital…' rel='stylesheet' type='text/css'> <span> <a target="_blank" href="http://kune.ourproject.org/" title="kune" rel="home"> Modified: trunk/src/main/webapp/tutorials/barters.svg =================================================================== --- trunk/src/main/webapp/tutorials/barters.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/barters.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -55,7 +55,7 @@ <xhtml:link type="text/css" rel="stylesheet" - href="http://fonts.googleapis.com/css?family=Ubuntu" /> + href="https://fonts.googleapis.com/css?family=Ubuntu" /> <style id="style4495"> text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } Modified: trunk/src/main/webapp/tutorials/blogs.svg =================================================================== --- trunk/src/main/webapp/tutorials/blogs.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/blogs.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -53,7 +53,7 @@   <xhtml:link - href="http://fonts.googleapis.com/css?family=Ubuntu" + href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css" /> <style Modified: trunk/src/main/webapp/tutorials/chats.svg =================================================================== --- trunk/src/main/webapp/tutorials/chats.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/chats.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -55,7 +55,7 @@ <xhtml:link type="text/css" rel="stylesheet" - href="http://fonts.googleapis.com/css?family=Ubuntu" /> + href="https://fonts.googleapis.com/css?family=Ubuntu" /> <style id="style10817"> text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } Modified: trunk/src/main/webapp/tutorials/docs.svg =================================================================== --- trunk/src/main/webapp/tutorials/docs.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/docs.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -63,7 +63,7 @@   <xhtml:link - href="http://fonts.googleapis.com/css?family=Ubuntu" + href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css" /> <style Modified: trunk/src/main/webapp/tutorials/events.svg =================================================================== --- trunk/src/main/webapp/tutorials/events.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/events.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -53,7 +53,7 @@   <xhtml:link - href="http://fonts.googleapis.com/css?family=Ubuntu" + href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css" /> <style Modified: trunk/src/main/webapp/tutorials/lists.svg =================================================================== --- trunk/src/main/webapp/tutorials/lists.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/lists.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -57,7 +57,7 @@   <xhtml:link - href="http://fonts.googleapis.com/css?family=Ubuntu" + href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css" /> <style Modified: trunk/src/main/webapp/tutorials/tasks.svg =================================================================== --- trunk/src/main/webapp/tutorials/tasks.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/tasks.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -53,7 +53,7 @@   <xhtml:link - href="http://fonts.googleapis.com/css?family=Ubuntu" + href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css" /> <style Modified: trunk/src/main/webapp/tutorials/wiki.svg =================================================================== --- trunk/src/main/webapp/tutorials/wiki.svg 2012-05-21 17:20:02 UTC (rev 1873) +++ trunk/src/main/webapp/tutorials/wiki.svg 2012-05-21 17:22:09 UTC (rev 1874) @@ -55,7 +55,7 @@ <xhtml:link type="text/css" rel="stylesheet" - href="http://fonts.googleapis.com/css?family=Ubuntu" /> + href="https://fonts.googleapis.com/css?family=Ubuntu" /> <style id="style26201"> text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; }

1 0