Author: vjrj_ Date: 2010-12-20 00:32:38 +0100 (Mon, 20 Dec 2010) New Revision: 1172 Added: trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/client/ trunk/src/main/java/cc/kune/core/client/state/UserSignIn.java trunk/src/main/java/cc/kune/core/client/state/UserSignOut.java trunk/src/main/java/cc/kune/core/public/images/kune-anim.gif trunk/src/main/java/cc/kune/domain/utils/ParticipationData.java trunk/src/main/java/cc/kune/domain/utils/UserBuddiesData.java trunk/src/main/java/cc/kune/public/ Removed: trunk/src/main/java/com/ trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java Modified: trunk/ trunk/pom.xml trunk/src/main/java/cc/kune/core/Core.gwt.xml trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java trunk/src/main/java/cc/kune/core/client/state/StateManager.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/public/ws.html trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java trunk/src/main/resources/dozerBeanMapping.xml trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java Log: NEW - # 9: Roo partial use/integration http://kune.ourproject.org/issues/ticket/9 Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - pmd-eclipse.log .pmd www-test screenlog.0 bin client public target Main-compile bin .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat .classpath gwt-out synccss.sh .externalToolBuilders .project .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien pom.xml.* + pmd-eclipse.log .pmd www-test screenlog.0 bin client public target Main-compile bin .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat .classpath gwt-out synccss.sh .externalToolBuilders .project .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien pom.xml.* .gwt Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/pom.xml 2010-12-19 23:32:38 UTC (rev 1172) @@ -344,7 +344,7 @@ <dependency> <groupId>org.waveprotocol</groupId> <artifactId>kune-wave-server</artifactId> - <version>0.0.2.2</version> + <version>0.0.3.1</version> </dependency> <dependency> <groupId>commons-cli</groupId> Added: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2010-12-19 23:32:38 UTC (rev 1172) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/src/gwt-module.dtd"> +<module rename-to="ws"> + <inherits name="com.google.gwt.user.User" /> + <inherits name='com.google.gwt.logging.Logging' /> + <inherits name="cc.kune.core.Core" /> + <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> + <!-- <source path='shared'/> --> + <!-- <public path="public"/> --> + + <!-- Logging Configuration --> + <set-property name="gwt.logging.enabled" value="TRUE" /> + <set-property name="gwt.logging.logLevel" value="INFO" /> + <set-property name="gwt.logging.consoleHandler" value="ENABLED" /> + <set-property name="gwt.logging.developmentModeHandler" + value="ENABLED" /> + <set-property name="gwt.logging.firebugHandler" value="ENABLED" /> + <set-property name="gwt.logging.hasWidgetsHandler" value="DISABLED" /> + <set-property name="gwt.logging.popupHandler" value="DISABLED" /> + <set-property name="gwt.logging.systemHandler" value="ENABLED" /> + <set-property name="gwt.logging.simpleRemoteHandler" + value="DISABLED" /> + + <!-- Uncomment if you are enabling server side deobfuscation of StackTraces + <set-property name="compiler.emulatedStack" value="true" /> <set-configuration-property + name="compiler.emulatedStack.recordLineNumbers" value="true" /> <set-configuration-property + name="compiler.emulatedStack.recordFileNames" value="true" /> --> + + <!-- NOTE: this only compiles for chromium/safari ============= --> + <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 --> + <!-- <set-property name="user.agent" value="gecko1_8" /> --> + <set-property name="user.agent" value="safari,gecko1_8" /> +</module> Property changes on: trunk/src/main/java/cc/kune/Kune.gwt.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/Core.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-19 23:32:38 UTC (rev 1172) @@ -26,8 +26,4 @@ <stylesheet src="fontface/stylesheet.css" /> <!-- Entrypoint =============================================== --> <entry-point class="cc.kune.core.client.KuneEntryPoint" /> - <!-- NOTE: this only compiles for chromium/safari ============= --> - <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 --> - <!-- <set-property name="user.agent" value="gecko1_8" /> --> - <set-property name="user.agent" value="safari" /> </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -72,6 +72,7 @@ bind(Session.class).to(SessionDefault.class).in(Singleton.class); bind(I18nTranslationService.class).to(I18nUITranslationService.class).in(Singleton.class); bind(ErrorHandler.class).in(Singleton.class); + bind(StateManagerDefault.class).in(Singleton.class); bind(StateManager.class).to(StateManagerDefault.class).in(Singleton.class); bind(ContentProvider.class).to(ContentProviderDefault.class).in(Singleton.class); bind(HistoryWrapper.class).to(HistoryWrapperDefault.class).in(Singleton.class); Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -35,6 +35,7 @@ import com.google.gwt.user.client.Window.ClosingEvent; import com.google.gwt.user.client.Window.ClosingHandler; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.RootPanel; import com.google.inject.Inject; import com.gwtplatform.mvp.client.EventBus; @@ -79,8 +80,14 @@ eventBus.fireEvent(new ProgressHideEvent()); eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, "Error fetching initial data")); Log.debug(error.getMessage()); + hideInitialPanels(); } + private void hideInitialPanels() { + RootPanel.get("kuneinitialcurtain").setVisible(false); + RootPanel.get("kuneloading").setVisible(false); + } + @Override public void onSuccess(final InitDataDTO initData) { session.setInitData(initData); @@ -89,6 +96,7 @@ Scheduler.get().scheduleDeferred(new ScheduledCommand() { @Override public void execute() { + hideInitialPanels(); eventBus.fireEvent(new ProgressHideEvent()); } }); Modified: trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -9,6 +9,7 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.gwtplatform.mvp.client.EventBus; @@ -17,11 +18,17 @@ public class SpinerViewImpl extends PopupViewWithUiHandlers<UiHandlers> implements SpinerView { + private final PopupPanel popup; + @Inject protected SpinerViewImpl(EventBus eventBus, WsArmor armor) { super(eventBus); widget = uiBinder.createAndBindUi(this); - armor.getSitebar().add(widget); + popup = new PopupPanel(false, false); + popup.add(widget); + popup.setPopupPosition(7, 0); + popup.setStyleName("k-spiner-popup"); + popup.show(); } private static SpinerViewImplUiBinder uiBinder = GWT.create(SpinerViewImplUiBinder.class); @@ -39,12 +46,12 @@ @Override public Widget asWidget() { - return widget; + return popup; } @Override public void fade() { - panel.setVisible(false); + popup.hide(); } @Override @@ -54,6 +61,6 @@ } else { label.setText(message); } - panel.setVisible(true); + popup.show(); } } Modified: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -46,6 +46,7 @@ import com.google.gwt.core.client.GWT; import com.google.inject.Inject; import com.google.inject.Provider; +import com.gwtplatform.mvp.client.EventBus; public class SessionDefault implements Session { private String userHash; @@ -60,9 +61,12 @@ private final Event<UserInfoDTO> onUserSignIn; private final Event0 onUserSignOut; private final Provider<UserServiceAsync> userServiceProvider; + private final EventBus eventBus; @Inject - public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider) { + public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider, + EventBus eventBus) { + this.eventBus = eventBus; this.userHash = cookieManager.getCurrentCookie(); this.userHash = userHash == null || userHash.equals("null") ? null : userHash; this.userServiceProvider = userServiceProvider; @@ -288,8 +292,10 @@ public void setCurrentUserInfo(final UserInfoDTO currentUserInfo) { this.currentUserInfo = currentUserInfo; if (currentUserInfo != null) { + eventBus.fireEvent(new UserSignInEvent(currentUserInfo)); onUserSignIn.fire(currentUserInfo); } else { + eventBus.fireEvent(new UserSignOutEvent()); onUserSignOut.fire(); } } Modified: trunk/src/main/java/cc/kune/core/client/state/StateManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -19,7 +19,6 @@ */ package cc.kune.core.client.state; - import cc.kune.core.client.actions.BeforeActionListener; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; @@ -33,18 +32,23 @@ void addBeforeStateChangeListener(BeforeActionListener listener); + @Deprecated void addSiteToken(String token, Listener0 whenToken); void gotoToken(StateToken newToken); void gotoToken(String newToken); + @Deprecated void onGroupChanged(Listener2<String, String> listener); + @Deprecated void onSocialNetworkChanged(Listener<StateAbstractDTO> listener); + @Deprecated void onStateChanged(Listener<StateAbstractDTO> listener); + @Deprecated void onToolChanged(Listener2<String, String> listener); void reload(); Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -38,9 +38,9 @@ import com.calclab.suco.client.events.Listener2; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; -import com.google.gwt.user.client.History; import com.google.inject.Inject; import com.gwtplatform.mvp.client.EventBus; +import com.gwtplatform.mvp.client.annotations.ProxyEvent; public class StateManagerDefault implements StateManager, ValueChangeHandler<String> { private final ContentProvider contentProvider; @@ -64,8 +64,6 @@ public StateManagerDefault(final ContentProvider contentProvider, final Session session, final HistoryWrapper history, final EventBus eventBus) { this.eventBus = eventBus; - // Put this outside here - History.addValueChangeHandler(this); this.contentProvider = contentProvider; this.session = session; this.history = history; @@ -75,27 +73,25 @@ this.onGroupChanged = new Event2<String, String>("onGroupChanged"); this.onToolChanged = new Event2<String, String>("onToolChanged"); this.onSocialNetworkChanged = new Event<StateAbstractDTO>("onSocialNetworkChanged"); - session.onUserSignIn(new Listener<UserInfoDTO>() { - @Override - public void onEvent(final UserInfoDTO parameter) { - if (previousToken == null) { - // starting up - reload(); - } else { - // do nothing, SigInPresent calls goto; - } - } - }); - session.onUserSignOut(new Listener0() { - @Override - public void onEvent() { - reload(); - } - }); siteTokens = new HashMap<String, Listener0>(); beforeStateChangeCollection = new BeforeActionCollection(); } + @ProxyEvent + public void onUserSignOut() { + reload(); + } + + @ProxyEvent + public void onUserSignIn(UserInfoDTO userInfo) { + if (previousToken == null) { + // starting up + reload(); + } else { + // do nothing, SigInPresent calls goto; + } + } + @Override public void addBeforeStateChangeListener(final BeforeActionListener listener) { beforeStateChangeCollection.add(listener); Added: trunk/src/main/java/cc/kune/core/client/state/UserSignIn.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/UserSignIn.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/UserSignIn.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -0,0 +1,12 @@ +package cc.kune.core.client.state; + +import cc.kune.core.shared.dto.UserInfoDTO; + +import com.gwtplatform.annotation.GenEvent; +import com.gwtplatform.annotation.Order; + +@GenEvent +public class UserSignIn { + @Order(1) + UserInfoDTO userInfo; +} Property changes on: trunk/src/main/java/cc/kune/core/client/state/UserSignIn.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/state/UserSignOut.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/UserSignOut.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/UserSignOut.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -0,0 +1,8 @@ +package cc.kune.core.client.state; + +import com.gwtplatform.annotation.GenEvent; + +@GenEvent +public class UserSignOut { + +} Property changes on: trunk/src/main/java/cc/kune/core/client/state/UserSignOut.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -15,6 +15,6 @@ @Override public void revealDefaultPlace() { - revealPlace(new PlaceRequest("home")); + revealPlace(new PlaceRequest("")); } } Modified: trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -23,7 +23,7 @@ private final AppStarter appStarter; @ProxyCodeSplit - @NameToken("home") + @NameToken("") public interface CoreProxy extends ProxyPlace<CorePresenter> { } @@ -45,15 +45,7 @@ @Override protected void revealInParent() { - RevealRootLayoutContentEvent.fire(getEventBus(), this); - // getEventBus().fireEvent(new ProgressShowEvent("Something")); - // Timer timer = new Timer() { - // @Override - // public void run() { - // getEventBus().fireEvent(new ProgressHideEvent()); - // } - // }; - // // timer.schedule(4); + RevealRootLayoutContentEvent.fire(this, this); } } Modified: trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -1,10 +1,12 @@ package cc.kune.core.client.ws; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.state.StateManagerDefault; import cc.kune.core.ws.armor.client.WsArmorImpl; import cc.kune.core.ws.armor.client.resources.WsArmorResources; import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.History; import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; @@ -24,12 +26,13 @@ * the body */ @Inject - public CoreViewImpl(final WsArmorImpl armor) { + public CoreViewImpl(final WsArmorImpl armor, StateManagerDefault stateManager) { this.armor = armor; GWT.<CoreResources> create(CoreResources.class).css().ensureInjected(); GWT.<WsArmorResources> create(WsArmorResources.class).style().ensureInjected(); armor.getEntityHeader().add(new InlineLabel("Test - a, e, i, o, u")); armor.getDocHeader().add(new InlineLabel("doc title")); + History.addValueChangeHandler(stateManager); } @Override Added: trunk/src/main/java/cc/kune/core/public/images/kune-anim.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/kune-anim.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2010-12-19 23:32:38 UTC (rev 1172) @@ -337,17 +337,17 @@ .kLoadingPanel { background-color: #feb295; -webkit-border-bottom-left-radius: 4px; - -moz-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; border-bottom-left-radius: 4px; -webkit-border-bottom-right-radius: 4px; - -moz-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; border-bottom-right-radius: 4px; - -webkit-border-top-right-radius: 4px; - -moz-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-top-left-radius: 4px; - -moz-border-top-left-radius: 4px; - border-top-left-radius: 4px; +/* -webkit-border-top-right-radius: 4px;*/ +/* -moz-border-radius-topright: 4px;*/ +/* border-top-right-radius: 4px;*/ +/* -webkit-border-top-left-radius: 4px;*/ +/* -moz-border-radius-topleft: 4px;*/ +/* border-top-left-radius: 4px;*/ padding: 0 10px 0 7px; } Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2010-12-19 23:32:38 UTC (rev 1172) @@ -8,9 +8,60 @@ </head> <!-- FIXME: make something local --> <!--<link href='http://fonts.googleapis.com/css?family=Droid+Sans' rel='stylesheet' type='text/css'>--> -<link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'> +<link href='http://fonts.googleapis.com/css?family=Inconsolata' + rel='stylesheet' type='text/css'> +<style type="text/css"> +#kuneinitialcurtain { + position: absolute; + left: 0px; + top: 0px; + width: 100%; + height: 100%; + background-color: #F7EBE3; + z-index: 9999; +} + +#kuneloading { + position: absolute; + left: 45%; + top: 40%; <!-- + padding: 0px; --> + z-index: 20001; + height: auto; + border: solid 2px #ccc; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; + background: white; +} + +#kuneloading a { + color: #225588; +} + +#kuneloading .kuneloading-indicator { + color: #444; + font: bold 13px tahoma, arial, helvetica; + padding: 5px 5px 10px 5px; + margin: 0; + height: auto; +} + +#kuneloading-msg { + font: normal 10px arial, tahoma, sans-serif; +} +</style> + <body> <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> <iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> +<div id="kuneinitialcurtain"></div> +<div id="kuneloading"> +<div class="kuneloading-indicator"><img src="images/kune-anim.gif" + width="35" height="35" alt="kune-loading" + style="margin-right: 3px; float: left; vertical-align: top;" />kune <br /> +<span id="kuneloading-msg">Starting...</span></div> +</div> + </body> -</html> \ No newline at end of file +</html> Copied: trunk/src/main/java/cc/kune/domain/utils/ParticipationData.java (from rev 1168, trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/utils/ParticipationData.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/utils/ParticipationData.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -0,0 +1,55 @@ +/* + * + * Copyright (C) 2007-2009 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.domain.utils; + +import java.util.List; + +import cc.kune.domain.Group; + +public class ParticipationData { + private List<Group> groupsIsAdmin; + private List<Group> groupsIsCollab; + + public ParticipationData() { + this(null, null); + } + + public ParticipationData(final List<Group> groupsIsAdmin, final List<Group> groupsIsCollab) { + this.groupsIsAdmin = groupsIsAdmin; + this.groupsIsCollab = groupsIsCollab; + } + + public List<Group> getGroupsIsAdmin() { + return groupsIsAdmin; + } + + public List<Group> getGroupsIsCollab() { + return groupsIsCollab; + } + + public void setGroupsIsAdmin(final List<Group> groupsIsAdmin) { + this.groupsIsAdmin = groupsIsAdmin; + } + + public void setGroupsIsCollab(final List<Group> groupsIsCollab) { + this.groupsIsCollab = groupsIsCollab; + } + +} Property changes on: trunk/src/main/java/cc/kune/domain/utils/ParticipationData.java ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java =================================================================== --- trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -19,10 +19,6 @@ */ package cc.kune.domain.utils; - -import org.ourproject.kune.platf.server.sn.ParticipationData; -import org.ourproject.kune.platf.server.sn.UserBuddiesData; - import cc.kune.core.shared.domain.SocialNetworkVisibility; import cc.kune.core.shared.domain.UserBuddiesVisibility; import cc.kune.core.shared.domain.utils.AccessRights; Copied: trunk/src/main/java/cc/kune/domain/utils/UserBuddiesData.java (from rev 1168, trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/utils/UserBuddiesData.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/utils/UserBuddiesData.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -0,0 +1,68 @@ +/* + * + * Copyright (C) 2007-2009 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.domain.utils; + +import java.util.ArrayList; +import java.util.List; + +import cc.kune.domain.User; + +public class UserBuddiesData { + + public static final UserBuddiesData EMPTY = new UserBuddiesData(); + + private List<User> buddies; + private int otherExtBuddies; + + public UserBuddiesData() { + otherExtBuddies = 0; + buddies = new ArrayList<User>(); + } + + public boolean contains(final String shortName) { + for (User buddie : buddies) { + if (buddie.getShortName().equals(shortName)) { + return true; + } + } + return false; + } + + public List<User> getBuddies() { + return buddies; + } + + public int getOtherExtBuddies() { + return otherExtBuddies; + } + + public void setBuddies(final List<User> buddies) { + this.buddies = buddies; + } + + public void setOtherExtBuddies(final int otherExtBuddies) { + this.otherExtBuddies = otherExtBuddies; + } + + @Override + public String toString() { + return "UserBuddiesData[ext: " + otherExtBuddies + " / int: " + buddies + "]"; + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.server.manager; -import org.ourproject.kune.platf.server.sn.ParticipationData; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.DefaultException; @@ -28,6 +27,7 @@ import cc.kune.domain.Group; import cc.kune.domain.SocialNetwork; import cc.kune.domain.User; +import cc.kune.domain.utils.ParticipationData; import cc.kune.domain.utils.SocialNetworkData; public interface SocialNetworkManager extends Manager<SocialNetwork, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -20,10 +20,10 @@ package org.ourproject.kune.platf.server.manager; import org.ourproject.kune.platf.server.manager.impl.SearchResult; -import org.ourproject.kune.platf.server.sn.UserBuddiesData; import cc.kune.core.client.errors.I18nNotFoundException; import cc.kune.domain.User; +import cc.kune.domain.utils.UserBuddiesData; public interface UserManager { /** Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -27,8 +27,6 @@ import org.ourproject.kune.platf.server.access.AccessRightsService; import org.ourproject.kune.platf.server.manager.SocialNetworkManager; import org.ourproject.kune.platf.server.manager.UserManager; -import org.ourproject.kune.platf.server.sn.ParticipationData; -import org.ourproject.kune.platf.server.sn.UserBuddiesData; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.AlreadyGroupMemberException; @@ -46,7 +44,9 @@ import cc.kune.domain.Group; import cc.kune.domain.SocialNetwork; import cc.kune.domain.User; +import cc.kune.domain.utils.ParticipationData; import cc.kune.domain.utils.SocialNetworkData; +import cc.kune.domain.utils.UserBuddiesData; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -40,7 +40,6 @@ import org.ourproject.kune.platf.server.manager.PropertyGroupManager; import org.ourproject.kune.platf.server.manager.UserManager; import org.ourproject.kune.platf.server.properties.ChatProperties; -import org.ourproject.kune.platf.server.sn.UserBuddiesData; import cc.kune.core.client.errors.I18nNotFoundException; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -49,6 +48,7 @@ import cc.kune.domain.Properties; import cc.kune.domain.PropertyGroup; import cc.kune.domain.User; +import cc.kune.domain.utils.UserBuddiesData; import com.google.inject.Inject; import com.google.inject.Provider; Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -1,55 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 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 org.ourproject.kune.platf.server.sn; - -import java.util.List; - -import cc.kune.domain.Group; - -public class ParticipationData { - private List<Group> groupsIsAdmin; - private List<Group> groupsIsCollab; - - public ParticipationData() { - this(null, null); - } - - public ParticipationData(final List<Group> groupsIsAdmin, final List<Group> groupsIsCollab) { - this.groupsIsAdmin = groupsIsAdmin; - this.groupsIsCollab = groupsIsCollab; - } - - public List<Group> getGroupsIsAdmin() { - return groupsIsAdmin; - } - - public List<Group> getGroupsIsCollab() { - return groupsIsCollab; - } - - public void setGroupsIsAdmin(final List<Group> groupsIsAdmin) { - this.groupsIsAdmin = groupsIsAdmin; - } - - public void setGroupsIsCollab(final List<Group> groupsIsCollab) { - this.groupsIsCollab = groupsIsCollab; - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -1,68 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 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 org.ourproject.kune.platf.server.sn; - -import java.util.ArrayList; -import java.util.List; - -import cc.kune.domain.User; - -public class UserBuddiesData { - - public static final UserBuddiesData EMPTY = new UserBuddiesData(); - - private List<User> buddies; - private int otherExtBuddies; - - public UserBuddiesData() { - otherExtBuddies = 0; - buddies = new ArrayList<User>(); - } - - public boolean contains(final String shortName) { - for (User buddie : buddies) { - if (buddie.getShortName().equals(shortName)) { - return true; - } - } - return false; - } - - public List<User> getBuddies() { - return buddies; - } - - public int getOtherExtBuddies() { - return otherExtBuddies; - } - - public void setBuddies(final List<User> buddies) { - this.buddies = buddies; - } - - public void setOtherExtBuddies(final int otherExtBuddies) { - this.otherExtBuddies = otherExtBuddies; - } - - @Override - public String toString() { - return "UserBuddiesData[ext: " + otherExtBuddies + " / int: " + buddies + "]"; - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -21,15 +21,15 @@ import java.util.List; -import org.ourproject.kune.platf.server.sn.ParticipationData; -import org.ourproject.kune.platf.server.sn.UserBuddiesData; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Group; import cc.kune.domain.SocialNetwork; +import cc.kune.domain.utils.ParticipationData; import cc.kune.domain.utils.SocialNetworkData; +import cc.kune.domain.utils.UserBuddiesData; public abstract class StateAbstract { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -21,12 +21,12 @@ import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.SocialNetworkManager; -import org.ourproject.kune.platf.server.sn.ParticipationData; import cc.kune.core.client.errors.DefaultException; import cc.kune.domain.Content; import cc.kune.domain.Group; import cc.kune.domain.User; +import cc.kune.domain.utils.ParticipationData; import com.google.inject.Inject; import com.google.inject.Singleton; Modified: trunk/src/main/resources/dozerBeanMapping.xml =================================================================== --- trunk/src/main/resources/dozerBeanMapping.xml 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/resources/dozerBeanMapping.xml 2010-12-19 23:32:38 UTC (rev 1172) @@ -182,7 +182,7 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.ParticipationDataDTO </class-a> - <class-b> org.ourproject.kune.platf.server.sn.ParticipationData </class-b> + <class-b> cc.kune.domain.utils.ParticipationData </class-b> </mapping> <mapping> <class-a> cc.kune.core.shared.dto.I18nLanguageDTO </class-a> @@ -254,7 +254,7 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.UserBuddiesDataDTO </class-a> - <class-b> org.ourproject.kune.platf.server.sn.UserBuddiesData </class-b> + <class-b> cc.kune.domain.utils.UserBuddiesData </class-b> </mapping> <mapping> <class-a> cc.kune.core.shared.dto.SocialNetworkDataDTO </class-a> Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -8,7 +8,6 @@ import org.junit.Before; import org.junit.Test; import org.ourproject.kune.platf.server.PersistenceTest; -import org.ourproject.kune.platf.server.sn.ParticipationData; import org.ourproject.kune.testhelper.ctx.DomainContext; import cc.kune.core.client.errors.AccessViolationException; @@ -20,6 +19,7 @@ import cc.kune.core.shared.dto.SocialNetworkRequestResult; import cc.kune.domain.Group; import cc.kune.domain.User; +import cc.kune.domain.utils.ParticipationData; import com.google.inject.Inject; import com.wideplay.warp.persist.Transactional; Modified: trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -10,8 +10,6 @@ import org.ourproject.kune.platf.server.TestDomainHelper; import org.ourproject.kune.platf.server.TestHelper; import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.sn.ParticipationData; -import org.ourproject.kune.platf.server.sn.UserBuddiesData; import org.ourproject.kune.platf.server.state.StateContent; import cc.kune.core.shared.domain.GroupListMode; @@ -39,7 +37,9 @@ import cc.kune.domain.Revision; import cc.kune.domain.SocialNetwork; import cc.kune.domain.User; +import cc.kune.domain.utils.ParticipationData; import cc.kune.domain.utils.SocialNetworkData; +import cc.kune.domain.utils.UserBuddiesData; import com.google.inject.Inject;